diff options
| -rw-r--r-- | res/menu/operations.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/res/menu/operations.xml b/res/menu/operations.xml index 0348e8736..639792f32 100644 --- a/res/menu/operations.xml +++ b/res/menu/operations.xml @@ -34,7 +34,7 @@ android:icon="@drawable/ic_menu_trash_holo_light" android:title="@string/delete" android:visible="false" - android:showAsAction="never" /> + android:showAsAction="ifRoom" /> <item android:id="@+id/action_edit" android:title="@string/edit" android:showAsAction="never" 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, |