From 9225bc538d58f2fd780793cf8e971b5d2ebbfc77 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Tue, 9 Apr 2013 10:09:03 -0700 Subject: [PATCH] Properly remove experimental WebView preference when unavailable. When the experimental WebView library is unavailable, properly remove it from the appropriate preferences group. Bug: 8572673 Change-Id: I34dd0720199c826ca12e0f991e2f6bd9c5ad35f3 --- src/com/android/settings/DevelopmentSettings.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index d5401951a2b..8694e9dc0fd 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -123,6 +123,8 @@ public class DevelopmentSettings extends PreferenceFragment 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 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 IMMEDIATELY_DESTROY_ACTIVITIES_KEY @@ -283,8 +285,10 @@ public class DevelopmentSettings extends PreferenceFragment mExperimentalWebView = findAndInitCheckboxPref(WEBVIEW_EXPERIMENTAL_KEY); } else { Preference experimentalWebView = findPreference(WEBVIEW_EXPERIMENTAL_KEY); - if (experimentalWebView != null) { - getPreferenceScreen().removePreference(experimentalWebView); + PreferenceGroup debugApplicationsCategory = (PreferenceGroup) + findPreference(DEBUG_APPLICATIONS_CATEGORY_KEY); + if (debugApplicationsCategory != null) { + debugApplicationsCategory.removePreference(experimentalWebView); } }