diff options
| author | ztenghui <ztenghui@google.com> | 2013-10-16 23:10:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-16 23:10:39 +0000 |
| commit | 9db9282667d9e272702cd2ee32d7415204084530 (patch) | |
| tree | e25fa7c714124f0dc179f4cbc5d415273f1f5400 /src/com | |
| parent | 66f3948315b6bf851dcd5d618d96d6fcda49f159 (diff) | |
| parent | 367c7c82a22ec007771059beec4aeff3ef96310e (diff) | |
| download | android_packages_apps_Snap-9db9282667d9e272702cd2ee32d7415204084530.tar.gz android_packages_apps_Snap-9db9282667d9e272702cd2ee32d7415204084530.tar.bz2 android_packages_apps_Snap-9db9282667d9e272702cd2ee32d7415204084530.zip | |
Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index bed8a2149..6256bfbf3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -101,6 +101,7 @@ public class PhotoModule private static final int CAMERA_OPEN_DONE = 8; private static final int OPEN_CAMERA_FAIL = 9; private static final int CAMERA_DISABLED = 10; + private static final int SWITCH_TO_GCAM_MODULE = 11; // The subset of parameters we need to update in setCameraParameters(). private static final int UPDATE_PARAM_INITIALIZE = 1; @@ -340,6 +341,10 @@ public class PhotoModule R.string.camera_disabled); break; } + + case SWITCH_TO_GCAM_MODULE: { + mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX); + } } } } @@ -1740,7 +1745,7 @@ public class PhotoModule // Switch to gcam module if HDR+ was selected if (doModeSwitch && !mIsImageCaptureIntent) { - mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX); + mHandler.sendEmptyMessage(SWITCH_TO_GCAM_MODULE); } } |