diff options
| author | Alan Newberger <alann@google.com> | 2013-09-04 19:01:59 -0700 |
|---|---|---|
| committer | Alan Newberger <alann@google.com> | 2013-09-04 19:01:59 -0700 |
| commit | 1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6 (patch) | |
| tree | a86f06cda2c63e3b2fdf26cd5df75352659c5642 | |
| parent | 5633994ecddb26bdd7a577a5b015b95bcb33e309 (diff) | |
| download | android_packages_apps_Snap-1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6.tar.gz android_packages_apps_Snap-1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6.tar.bz2 android_packages_apps_Snap-1ef76d4cbd73c02cb8d02cf4cde3f4cee81548d6.zip | |
reintroduce action bar hiding for onDataChanged
this code was present but got inadvertently removed by a subsequent
change Icb07e9e890a72bec6ed3b4c5a7e33400be3446f8.
Change-Id: If6c0f31497406fc3056dbb48d67b195342f6d10f
| -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 3521de2d4..01da30932 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -243,7 +243,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) { |