diff options
| author | ztenghui <ztenghui@google.com> | 2013-10-03 16:02:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-03 16:02:44 +0000 |
| commit | 4c0aede4ea37f8fad98a40ec4d28028f338591bd (patch) | |
| tree | 3cc54360f96511f03b783460870ee949789afd56 | |
| parent | 9ac97492cafafc02357de21074d95b29d55d2e9f (diff) | |
| parent | e941cbeeacac11fbae5ae8b06cc1b311e3f6f36d (diff) | |
| download | android_packages_apps_Snap-4c0aede4ea37f8fad98a40ec4d28028f338591bd.tar.gz android_packages_apps_Snap-4c0aede4ea37f8fad98a40ec4d28028f338591bd.tar.bz2 android_packages_apps_Snap-4c0aede4ea37f8fad98a40ec4d28028f338591bd.zip | |
Merge "Only show delete action when in secure camera mode." into gb-ub-photos-carlsbad
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 7705e379e..f306f1eda 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -588,6 +588,11 @@ public class CameraActivity extends Activity break; } + // In secure camera mode, we only support delete operation. + if (isSecureCamera()) { + supported &= SUPPORT_DELETE; + } + setMenuItemVisible(mActionBarMenu, R.id.action_delete, (supported & SUPPORT_DELETE) != 0); setMenuItemVisible(mActionBarMenu, R.id.action_rotate_ccw, |