PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6fdc642e: am f452008f: Merge "Properly remove experimental WebView preference when unavailable." into jb-mr2-dev

Browse Source 
* commit '6fdc642e8640927bee97f93812a58897afa252e9':
  Properly remove experimental WebView preference when unavailable.
This commit is contained in:
Ben Murdoch
2013-04-09 14:25:22 -07:00
committed by Android Git Automerger
parent dfead4eb31 6fdc642e86
commit 9f8c61ee1a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/DevelopmentSettings.java
View File

@@ -125,6 +125,8 @@ public class DevelopmentSettings extends PreferenceFragment
private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale"; private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices"; private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category"; private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
private static final String DEBUG_APPLICATIONS_CATEGORY_KEY = "debug_applications_category";
private static final String OPENGL_TRACES_KEY = "enable_opengl_traces"; private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
@@ -293,8 +295,10 @@ public class DevelopmentSettings extends PreferenceFragment
mExperimentalWebView = findAndInitCheckboxPref(WEBVIEW_EXPERIMENTAL_KEY); mExperimentalWebView = findAndInitCheckboxPref(WEBVIEW_EXPERIMENTAL_KEY);
} else { } else {
Preference experimentalWebView = findPreference(WEBVIEW_EXPERIMENTAL_KEY); Preference experimentalWebView = findPreference(WEBVIEW_EXPERIMENTAL_KEY);
if (experimentalWebView != null) { PreferenceGroup debugApplicationsCategory = (PreferenceGroup)
getPreferenceScreen().removePreference(experimentalWebView); findPreference(DEBUG_APPLICATIONS_CATEGORY_KEY);
if (debugApplicationsCategory != null) {
debugApplicationsCategory.removePreference(experimentalWebView);
} }
} }