Merge remote-tracking branch 'origin/features/1.2.300' into features/1.2.0_ogawa-y

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/DeviceImageListActivity.java

@@ -74,7 +74,7 @@ public class DeviceImageListActivity extends ABVUIActivity {
     private static final String THUMB_IMAGE_CACHE_DIRECTORY_NAME = "thumb";
     private static final String THUMB_IMAGE_CACHE_DIRECTORY_NAME = "thumb";
 
 
     //スマートフォン表示時、登録ボタンスケール
     //スマートフォン表示時、登録ボタンスケール
-    private static final float PHONE_REGISTER_BUTTON_SCALE = 0.55f;
+    private static final float PHONE_REGISTER_BUTTON_SCALE = 0.6f;
     //スマートフォン表示時、THETAボタンスケール
     //スマートフォン表示時、THETAボタンスケール
     private static final float PHONE_THETA_BUTTON_SCALE = 0.8f;
     private static final float PHONE_THETA_BUTTON_SCALE = 0.8f;
 
 
@@ -444,7 +444,6 @@ public class DeviceImageListActivity extends ABVUIActivity {
                         } else {
                         } else {
                             showSimpleAlertDialog(errorMessage);
                             showSimpleAlertDialog(errorMessage);
                         }
                         }
-
                     }
                     }
                 });
                 });
             }
             }

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/theta/ThetaActivity.java

@@ -42,7 +42,7 @@ public class ThetaActivity extends ABVUIActivity {
         public void onReceive(Context context, Intent intent) {
         public void onReceive(Context context, Intent intent) {
             unregisterReceiver(wifiReceiver);
             unregisterReceiver(wifiReceiver);
             boolean isConnected = mThetaHelper.checkThetaCameraWifiConnected(mWifiManager);
             boolean isConnected = mThetaHelper.checkThetaCameraWifiConnected(mWifiManager);
-
+            closeProgressPopup();
             //THETAカメラ画面閉じる
             //THETAカメラ画面閉じる
             if (mWifiScanType == Constant.WifiScanType.CloseCameraActivity) {
             if (mWifiScanType == Constant.WifiScanType.CloseCameraActivity) {
                 if (isConnected) {
                 if (isConnected) {
@@ -57,7 +57,6 @@ public class ThetaActivity extends ABVUIActivity {
                     AlertDialogUtil.showAlertDialog(ThetaActivity.this, R.string.app_name, R.string.msg_theta_wifi_disconnect, true, new DialogInterface.OnClickListener() {
                     AlertDialogUtil.showAlertDialog(ThetaActivity.this, R.string.app_name, R.string.msg_theta_wifi_disconnect, true, new DialogInterface.OnClickListener() {
                         @Override
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                         public void onClick(DialogInterface dialog, int which) {
-                            closeProgressPopup();
                             //Thetaカメラ関連Activity終了
                             //Thetaカメラ関連Activity終了
                             ActivityHandlingHelper.getInstance().finishAllThetaActivity();
                             ActivityHandlingHelper.getInstance().finishAllThetaActivity();
                             mThetaHelper.appConnectedWifiDefault();
                             mThetaHelper.appConnectedWifiDefault();