diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-02-14 05:11:49 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-02-15 04:02:46 +0200 |
| commit | 455c85b2cdea4939acff86db1989c49225c1ca1d (patch) | |
| tree | 361c2b556e413691400a5833a472653485f28d5a | |
| parent | 8f53249fac0b4f4fed36e5d062c3a5aa46e48e6b (diff) | |
| download | android_packages_apps_Camera2-455c85b2cdea4939acff86db1989c49225c1ca1d.tar.gz android_packages_apps_Camera2-455c85b2cdea4939acff86db1989c49225c1ca1d.tar.bz2 android_packages_apps_Camera2-455c85b2cdea4939acff86db1989c49225c1ca1d.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 8caa925bf..3474d2c9c 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -80,9 +80,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 25c9c7129..af80741b5 100644 --- a/src/com/android/camera/settings/CameraSettingsActivity.java +++ b/src/com/android/camera/settings/CameraSettingsActivity.java @@ -36,7 +36,6 @@ import com.android.camera.debug.Log; import com.android.camera.settings.SettingsUtil.SelectedPictureSizes; import com.android.camera.settings.SettingsUtil.SelectedVideoQualities; import com.android.camera.util.CameraSettingsActivityHelper; -import com.android.camera.util.GoogleHelpHelper; import com.android.camera2.R; import com.android.ex.camera2.portability.CameraAgentFactory; import com.android.ex.camera2.portability.CameraDeviceInfo; @@ -80,7 +79,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; @@ -141,15 +139,6 @@ public class CameraSettingsActivity extends FragmentActivity { (PreferenceScreen) findPreference(PREF_CATEGORY_ADVANCED); setPreferenceScreenIntent(advancedScreen); - Preference helpPref = findPreference(PREF_LAUNCH_HELP); - helpPref.setOnPreferenceClickListener( - new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - GoogleHelpHelper.launchGoogleHelp(activity); - return true; - } - }); getPreferenceScreen().getSharedPreferences() .registerOnSharedPreferenceChangeListener(this); } |