Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev

am: 69faf046c0 Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249
2017-04-11 23:48:17 +00:00
parent 007b9e3cdd 69faf046c0
commit d9200e5ba4
3 changed files with 20 additions and 3 deletions
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -401,7 +401,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
            // Block access to developer options if the user is not the owner, if user policy
            // restricts it, or if the device has not been provisioned
            mUnavailable = true;
-            setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
+            addPreferencesFromResource(R.xml.empty_settings);
            return;
        }