diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-10 00:24:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-10 00:24:58 +0000 |
| commit | abfae01a3591d63c87dd9d08247e39b8296f0fe5 (patch) | |
| tree | 4209a763da0de765b7614b9828c428e068f313e0 | |
| parent | 47fbb074ed34f8359f0bd075f46cd130293a1f25 (diff) | |
| parent | f6cfa8209826be13d4a4ba3aa18b67bdd98db95d (diff) | |
| download | Camera2-abfae01a3591d63c87dd9d08247e39b8296f0fe5.tar.gz | |
Merge "Remove Help & Feedback option with absent implementation" am: 444195c51d am: cc987aee81 am: 381d0ee293 am: 467ad78f1a am: f6cfa82098
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1455284
Change-Id: I3d351726a37263b936c46abaf7022a9f5ef2464d
| -rw-r--r-- | res/xml/camera_preferences.xml | 5 | ||||
| -rw-r--r-- | src/com/android/camera/settings/CameraSettingsActivity.java | 10 |
2 files changed, 0 insertions, 15 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 771396742..9c2a1a274 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -71,9 +71,4 @@ android:title="@string/pref_camera_exposure_compensation" /> </PreferenceScreen> - <!-- Google Help and feedback launcher --> - <Preference - android:key="pref_launch_help" - android:title="@string/setting_google_help_and_feedback" /> - </PreferenceScreen> diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java index c2e060a1e..85d13f67b 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -142,7 +142,6 @@ public class CameraSettingsActivity extends FragmentActivity { public static final String PREF_CATEGORY_RESOLUTION = "pref_category_resolution"; public static final String PREF_CATEGORY_ADVANCED = "pref_category_advanced"; - public static final String PREF_LAUNCH_HELP = "pref_launch_help"; private static final Log.Tag TAG = new Log.Tag("SettingsFragment"); private static DecimalFormat sMegaPixelFormat = new DecimalFormat("##0.0"); private String[] mCamcorderProfileNames; @@ -220,15 +219,6 @@ public class CameraSettingsActivity extends FragmentActivity { setPreferenceScreenIntent(advancedScreen); } - Preference helpPref = findPreference(PREF_LAUNCH_HELP); - helpPref.setOnPreferenceClickListener( - new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - new GoogleHelpHelper(activity).launchGoogleHelp(); - return true; - } - }); getPreferenceScreen().getSharedPreferences() .registerOnSharedPreferenceChangeListener(this); } |