diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-10-21 09:34:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-10-21 09:34:56 -0700 |
| commit | 9804e6a0f44aefc7e13f81a8c72e9b4d332961af (patch) | |
| tree | 1aeeed546a40f98534585c3c8a7007d43262b07d /src/com/android/camera/CameraActivity.java | |
| parent | 19dfc1713c1212f73968251b71c46ae7f90e3dd2 (diff) | |
| parent | 87b4a40d588a7ae8a61cb353c4cff8df37f7b483 (diff) | |
| download | android_packages_apps_Snap-9804e6a0f44aefc7e13f81a8c72e9b4d332961af.tar.gz android_packages_apps_Snap-9804e6a0f44aefc7e13f81a8c72e9b4d332961af.tar.bz2 android_packages_apps_Snap-9804e6a0f44aefc7e13f81a8c72e9b4d332961af.zip | |
Merge "Camera: open Camera and start Preview in a seperate thread."
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 36b5111ca..c40dacc0a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -176,6 +176,7 @@ public class CameraActivity extends Activity private ViewGroup mUndoDeletionBar; private boolean mIsUndoingDeletion = false; private boolean mIsEditActivityInProgress = false; + protected boolean mIsModuleSwitchInProgress = false; private Uri[] mNfcPushUris = new Uri[1]; @@ -1428,6 +1429,7 @@ public class CameraActivity extends Activity return; } + mIsModuleSwitchInProgress = true; CameraHolder.instance().keep(); closeModule(mCurrentModule); setModuleFromIndex(moduleIndex); @@ -1442,6 +1444,7 @@ public class CameraActivity extends Activity // starts up. SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); prefs.edit().putInt(CameraSettings.KEY_STARTUP_MODULE_INDEX, moduleIndex).apply(); + mIsModuleSwitchInProgress = false; } /** |