diff options
author | ztenghui <ztenghui@google.com> | 2013-09-03 14:34:25 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-03 14:34:25 -0700 |
commit | 6d7237f2d34f0d4f9bf24c14dddee123d6caa488 (patch) | |
tree | 7995b66bd96c5b89f82bc4c98dfa297d5554bb23 | |
parent | 1247a8bc53cd391d0b21c06adbf63e4b621c5bc8 (diff) | |
parent | 269c824d720b2e902c4ad6c3bb23422644da1f41 (diff) | |
download | android_packages_apps_Snap-6d7237f2d34f0d4f9bf24c14dddee123d6caa488.tar.gz android_packages_apps_Snap-6d7237f2d34f0d4f9bf24c14dddee123d6caa488.tar.bz2 android_packages_apps_Snap-6d7237f2d34f0d4f9bf24c14dddee123d6caa488.zip |
am 269c824d: Merge "Don\'t show the action bar in the capture intent." into gb-ub-photos-carlsbad
* commit '269c824d720b2e902c4ad6c3bb23422644da1f41':
Don't show the action bar in the capture intent.
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index a2bfd1796..47a964f06 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -269,7 +269,11 @@ public class CameraActivity extends Activity if (mActionBar.isShowing()) { mActionBar.hide(); } else { - mActionBar.show(); + // In the preview, don't show the action bar if that is + // a capture intent. + if (!isCaptureIntent()) { + mActionBar.show(); + } } return mActionBar.isShowing(); } @@ -580,6 +584,16 @@ public class CameraActivity extends Activity } } + private boolean isCaptureIntent() { + if (MediaStore.ACTION_VIDEO_CAPTURE.equals(getIntent().getAction()) + || MediaStore.ACTION_IMAGE_CAPTURE.equals(getIntent().getAction()) + || MediaStore.ACTION_IMAGE_CAPTURE_SECURE.equals(getIntent().getAction())) { + return true; + } else { + return false; + } + } + @Override public void onCreate(Bundle state) { super.onCreate(state); |