summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/com/android/camera/CameraActivity.java6
2 files changed, 6 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 383f696cb..572ae9516 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -48,7 +48,7 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:icon="@mipmap/ic_launcher_camera"
android:label="@string/snapcam_app_name"
- android:launchMode="singleTop"
+ android:launchMode="singleTask"
android:logo="@mipmap/ic_launcher_gallery"
android:screenOrientation="portrait"
android:taskAffinity="com.android.camera.CameraActivity"
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index a23985ef1..98fddcbe8 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -165,6 +165,8 @@ public class CameraActivity extends Activity
private static final int HIDE_ACTION_BAR = 1;
private static final long SHOW_ACTION_BAR_TIMEOUT_MS = 3000;
+ private static final int SWITCH_SAVE_PATH = 2;
+
/** Permission request code */
private static final int PERMISSIONS_REQUEST_ACCESS_COARSE_LOCATION = 1;
@@ -369,6 +371,8 @@ public class CameraActivity extends Activity
if (msg.what == HIDE_ACTION_BAR) {
removeMessages(HIDE_ACTION_BAR);
CameraActivity.this.setSystemBarsVisibility(false);
+ }else if ( msg.what == SWITCH_SAVE_PATH ) {
+ mCurrentModule.onSwitchSavePath();
}
}
}
@@ -1892,7 +1896,7 @@ public class CameraActivity extends Activity
mStorageSpaceBytes = Storage.getAvailableSpace();
if (Storage.switchSavePath()) {
mStorageSpaceBytes = Storage.getAvailableSpace();
- mCurrentModule.onSwitchSavePath();
+ mMainHandler.sendEmptyMessage(SWITCH_SAVE_PATH);
}
return mStorageSpaceBytes;
}