diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-02-14 05:11:49 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-10-07 22:04:13 +0300 |
| commit | a6c500b62ba3c0dedc42f34eb3b29296c4eb572b (patch) | |
| tree | ce7e71c4c0a9f84619daeeff93302c4c61617b69 | |
| parent | 6b9cbe22438cc3f5483dc513e8b3a18d057be700 (diff) | |
| download | android_packages_apps_Camera2-a6c500b62ba3c0dedc42f34eb3b29296c4eb572b.tar.gz android_packages_apps_Camera2-a6c500b62ba3c0dedc42f34eb3b29296c4eb572b.tar.bz2 android_packages_apps_Camera2-a6c500b62ba3c0dedc42f34eb3b29296c4eb572b.zip | |
Camera2: Remove google help preference
Change-Id: Ieae3a79b1e7b470b9237f76808d7a038fcaee101
| -rw-r--r-- | res/xml/camera_preferences.xml | 5 | ||||
| -rw-r--r-- | src/com/android/camera/settings/CameraSettingsActivity.java | 11 |
2 files changed, 0 insertions, 16 deletions
diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index 3ba076b98..ff97e2cf3 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -81,9 +81,4 @@ android:title="@string/pref_camera_max_brightness_title" /> </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 3fe75c628..c83d25600 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -45,7 +45,6 @@ import com.android.camera.one.OneCameraModule; import com.android.camera.settings.PictureSizeLoader.PictureSizes; import com.android.camera.settings.SettingsUtil.SelectedVideoQualities; import com.android.camera.util.CameraSettingsActivityHelper; -import com.android.camera.util.GoogleHelpHelper; import com.android.camera.util.Size; import com.android.camera2.R; import com.android.ex.camera2.portability.CameraAgentFactory; @@ -139,7 +138,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; @@ -218,15 +216,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); } |