diff options
| author | Emilian Peev <epeev@google.com> | 2022-03-08 11:40:33 -0800 |
|---|---|---|
| committer | Emilian Peev <epeev@google.com> | 2022-03-08 11:42:38 -0800 |
| commit | 866d9fcb35fd6acede2c85a8398321d1b0dc259a (patch) | |
| tree | efcadc9cb2981a4ed20a079b8a5aecfd94aab678 | |
| parent | 70ae0c10bbf77844a177454319137edcf463e985 (diff) | |
| download | Camera2-866d9fcb35fd6acede2c85a8398321d1b0dc259a.tar.gz | |
Remove Help & Feedback option from filmstrip
The "Help & Feedback" menu option in the camera
filmstrip context menu is not functional and can
be confusing to users.
Bug: 169469748
Test: Manual using camera application
Change-Id: Ibb6bd52e5f813f734eb83dd0ba18394e44cb3538
| -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; |