summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-09-03 11:27:21 -0700
committerztenghui <ztenghui@google.com>2013-09-03 14:19:51 -0700
commit2c3d9a58d8942f73bc16c71e57584e4d89410185 (patch)
treef6093e5db2f4ab3c8e20beac7c7a022f285f79b6
parent5457782daf2d03bdc1ac8f6b7143c92c62c3cfd0 (diff)
downloadandroid_packages_apps_Snap-2c3d9a58d8942f73bc16c71e57584e4d89410185.tar.gz
android_packages_apps_Snap-2c3d9a58d8942f73bc16c71e57584e4d89410185.tar.bz2
android_packages_apps_Snap-2c3d9a58d8942f73bc16c71e57584e4d89410185.zip
Don't show action bar when in camera preview.
There are 3 cases we need to toggle the action bar. 1. Touch in full screen mode. onToggleActionBarVisibility() 2. Swipe back and forth to film stripe from preview. onSwitchMode() 3. In full screen mode, current data becomes the preview. onCurrentDataChanged() bug:10563392 Change-Id: I576c49b767cd863da725cf991238c27440d85b9b
-rw-r--r--src/com/android/camera/CameraActivity.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index aadb7d75c..a2bfd1796 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -240,7 +240,14 @@ public class CameraActivity extends Activity
hidePanoStitchingProgress();
return;
}
- updateActionBarMenu(dataID);
+
+ if (currentData.getLocalDataType() ==
+ LocalData.LOCAL_CAMERA_PREVIEW) {
+ // Don't show the action bar in Camera preview.
+ mActionBar.hide();
+ } else {
+ updateActionBarMenu(dataID);
+ }
Uri contentUri = currentData.getContentUri();
if (contentUri == null) {