diff options
| author | ztenghui <ztenghui@google.com> | 2013-09-03 14:27:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-03 14:27:17 -0700 |
| commit | 1247a8bc53cd391d0b21c06adbf63e4b621c5bc8 (patch) | |
| tree | f06676cb101be4b594f226572e7633abf1baa6c0 | |
| parent | 95dd838ab3d0768de66b67763a7aa46706e1305f (diff) | |
| parent | 2c3d9a58d8942f73bc16c71e57584e4d89410185 (diff) | |
| download | android_packages_apps_Snap-1247a8bc53cd391d0b21c06adbf63e4b621c5bc8.tar.gz android_packages_apps_Snap-1247a8bc53cd391d0b21c06adbf63e4b621c5bc8.tar.bz2 android_packages_apps_Snap-1247a8bc53cd391d0b21c06adbf63e4b621c5bc8.zip | |
am 2c3d9a58: Don\'t show action bar when in camera preview.
* commit '2c3d9a58d8942f73bc16c71e57584e4d89410185':
Don't show action bar when in camera preview.
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 9 |
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) { |