diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-08 22:13:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 22:13:56 +0000 |
| commit | f22e081ab927c47d365069c9dab17089d4de09fe (patch) | |
| tree | efcadc9cb2981a4ed20a079b8a5aecfd94aab678 | |
| parent | 70ae0c10bbf77844a177454319137edcf463e985 (diff) | |
| parent | 9028b9112f2cc22b7f828dd395c101795ea148d0 (diff) | |
| download | Camera2-f22e081ab927c47d365069c9dab17089d4de09fe.tar.gz | |
Merge "Remove Help & Feedback option from filmstrip" am: 9028b9112f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2016695
Change-Id: I1a95bc36b86ad6519cbf00b22e3f1aeb333d1147
| -rw-r--r-- | res/menu/filmstrip_menu.xml | 4 | ||||
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 15 |
2 files changed, 0 insertions, 19 deletions
diff --git a/res/menu/filmstrip_menu.xml b/res/menu/filmstrip_menu.xml index 7b4053d37..56c38dafe 100644 --- a/res/menu/filmstrip_menu.xml +++ b/res/menu/filmstrip_menu.xml @@ -20,8 +20,4 @@ android:title="@string/details" android:visible="true" android:showAsAction="never" /> - <item android:id="@+id/action_help_and_feedback" - android:title="@string/setting_google_help_and_feedback" - android:visible="true" - android:showAsAction="never" /> </menu> diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 1a8134920..a9d4befb2 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1359,10 +1359,6 @@ public class CameraActivity extends QuickActivity case R.id.action_details: showDetailsDialog(mFilmstripController.getCurrentAdapterIndex()); return true; - case R.id.action_help_and_feedback: - mResetToPreviewOnResume = false; - new GoogleHelpHelper(this).launchGoogleHelp(); - return true; default: return super.onOptionsItemSelected(item); } @@ -2340,17 +2336,6 @@ public class CameraActivity extends QuickActivity return super.onCreateOptionsMenu(menu); } - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - if (isSecureCamera() && !ApiHelper.isLOrHigher()) { - // Compatibility pre-L: launching new activities right above - // lockscreen does not reliably work, only show help if not secure - menu.removeItem(R.id.action_help_and_feedback); - } - - return super.onPrepareOptionsMenu(menu); - } - protected long getStorageSpaceBytes() { synchronized (mStorageSpaceLock) { return mStorageSpaceBytes; |