Merge commit '2b8606e7d2f995cccf5c457cf93a2cdb717a469a' into HEAD

Google Automerger · Google Automerger · commit b49988e2e9f8 · 2015-09-02T00:31:40.000Z
diff --git a/samples-android/ButtonClicker/AndroidManifest.xml b/samples-android/ButtonClicker/AndroidManifest.xml
@@ -5,7 +5,7 @@
     
     <uses-sdk
         android:minSdkVersion="11"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="22" />
 
     <uses-feature android:glEsVersion="0x00020000" >
     </uses-feature>
@@ -47,4 +47,4 @@
             </intent-filter>
         </activity>
     </application>
-</manifest>
+</manifest>
diff --git a/samples-android/ButtonClicker/jni/Application.mk b/samples-android/ButtonClicker/jni/Application.mk
@@ -1,8 +1,5 @@
-APP_PLATFORM := android-9
-#APP_ABI := all
+APP_PLATFORM := android-22
 APP_ABI := armeabi-v7a
-#,arm64-v8a
-
 APP_STL := c++_static
 
 APP_CPPFLAGS := -std=c++11
diff --git a/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp b/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp
@@ -105,15 +105,15 @@ void Engine::InitGooglePlayGameServices() {
  *
  */
 void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
-  if (!initialized_resources_) return;
+  if(!initialized_resources_) {
+    return;
+  }
+
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
     EnableUI(false);
-    authorizing_ = true;
     if (op == gpg::AuthOperation::SIGN_IN) {
-      LOGI("Signing in to GPG");
       status_text_->SetAttribute("Text", "Signing In...");
     } else {
-      LOGI("Signing out from GPG");
       status_text_->SetAttribute("Text", "Signing Out...");
     }
   });
@@ -136,11 +136,12 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
     });
   }
 
-  if (!initialized_resources_) return;
+  if(!initialized_resources_) {
+    return;
+  }
 
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
     EnableUI(true);
-    authorizing_ = false;
     button_sign_in_->SetAttribute(
         "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");
 
@@ -560,8 +561,14 @@ void Engine::LeaveGame() {
  * invoking jui_helper functions to create java UIs
  */
 void Engine::InitUI() {
+  // The window initialization
+  jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);
+
   // Show toast with app label
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
+    if(NULL == jui_helper::JUIWindow::GetInstance()->GetContext()) {
+        return;
+    }
     jui_helper::JUIToast toast(
         ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
     toast.Show();
@@ -572,9 +579,6 @@ void Engine::InitUI() {
   // UIs.
   //
 
-  // The window initialization
-  jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);
-
   //
   // Buttons
   //
@@ -586,7 +590,6 @@ void Engine::InitUI() {
                            jui_helper::LAYOUT_PARAMETER_TRUE);
   button_sign_in_->SetCallback([this](jui_helper::JUIView *view,
                                       const int32_t message) {
-    LOGI("button_sign_in_ click: %d", message);
     if (message == jui_helper::JUICALLBACK_BUTTON_UP) {
       if (service_->IsAuthorized()) {
         service_->SignOut();
@@ -647,7 +650,6 @@ void Engine::InitUI() {
   // Init play game services
   InitGooglePlayGameServices();
 
-  if (authorizing_) EnableUI(false);
   return;
 }
 
@@ -669,7 +671,6 @@ void Engine::SetParameters(jui_helper::JUIButton *button,
  * Enable/Disable management UI
  */
 void Engine::EnableUI(bool enable) {
-  LOGI("Updating UI:%d", enable);
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, enable]() {
     button_sign_in_->SetAttribute("Enabled", enable);
 
diff --git a/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h b/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h
@@ -147,7 +147,6 @@ class Engine : public gpg::IRealTimeEventListener {
                             // in OnRoomStatusChanged()
   int32_t score_counter_;   // Score counter of local player
   bool playing_;            // Am I playing a game?
-  bool authorizing_;        // Am I signing in to gpg service?
   std::string self_id_;     // Local player's ID
   double start_time_;       // Game start time
 
diff --git a/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp b/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp
@@ -23,7 +23,6 @@
 Engine::Engine()
     : initialized_resources_(false),
       has_focus_(false),
-      authorizing_(false),
       app_(nullptr),
       dialog_(nullptr),
       textViewFPS_(nullptr),
@@ -192,7 +191,6 @@ int32_t Engine::HandleInput(android_app *app, AInputEvent *event) {
  */
 void Engine::HandleCmd(struct android_app *app, int32_t cmd) {
   Engine *eng = (Engine *)app->userData;
-  LOGI("message %d", cmd);
   switch (cmd) {
     case APP_CMD_SAVE_STATE:
       break;
diff --git a/samples-android/Teapot/jni/NativeGameActivity.cpp b/samples-android/Teapot/jni/NativeGameActivity.cpp
@@ -112,16 +112,16 @@ Engine::~Engine() {
 }
 
 void Engine::InitUI() {
+  // The window is being shown, get it ready.
+  jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);
+
   // Show toast with app label
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
     jui_helper::JUIToast toast(
       ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
     toast.Show();
   });
 
-  // The window is being shown, get it ready.
-  jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);
-
   //
   // Buttons
   //
@@ -472,6 +472,9 @@ void Engine::UpdateFPS(float fps) {
 }
 
 void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
+  if (!initialized_resources_) {
+    return;
+  }
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
     if (status_text_) {
       if (op == gpg::AuthOperation::SIGN_IN) {
@@ -485,6 +488,10 @@ void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 
 void Engine::OnAuthActionFinished(gpg::AuthOperation op,
                                   gpg::AuthStatus status) {
+  if (!initialized_resources_) {
+    return;
+  }
+
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
     if (status == gpg::AuthStatus::VALID) {
       jui_helper::JUIToast toast("Signed In.");
diff --git a/samples-android/build.sh b/samples-android/build.sh
@@ -9,11 +9,11 @@ fi
 # List of targets to build. Interpreted as directories relative to
 # this script's path.
 declare targets=(           \
-  CollectAllTheStarsNative  \
-  Minimalist                \
-  TbmpSkeletonNative        \
-  Teapot                    \
-  TrivialQuestNative        \
+#  CollectAllTheStarsNative  \
+#  Minimalist                \
+#  TbmpSkeletonNative        \
+#  Teapot                    \
+#  TrivialQuestNative        \
   ButtonClicker             \
 )
 
diff --git a/samples-android/build_sample.sh b/samples-android/build_sample.sh
@@ -104,7 +104,7 @@ trap cleanup EXIT
 # Copy the lib project and run "android update lib-project" on it.
 # This requires a target, which apparently needs to be android-10.
 cp -r ${lib_project} ${private_lib}
-${android_tool} update lib-project --path ${private_lib} --target android-10
+${android_tool} update lib-project --path ${private_lib} --target android-22
 
 #
 # At last, build!

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ trap cleanup EXIT`
`104`	`104`	`# Copy the lib project and run "android update lib-project" on it.`
`105`	`105`	`# This requires a target, which apparently needs to be android-10.`
`106`	`106`	`cp -r ${lib_project} ${private_lib}`
`107`		`-${android_tool} update lib-project --path ${private_lib} --target android-10`
	`107`	`+${android_tool} update lib-project --path ${private_lib} --target android-22`
`108`	`108`
`109`	`109`	`#`
`110`	`110`	`# At last, build!`