Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev am: 69faf046c0

am: d9200e5ba4

Change-Id: I4c125d7c62b94a351544a7b64547add0a774db3e

src/com/android/settings/ApnSettings.java

@@ -184,8 +184,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
         mUnavailable = isUiRestricted();
         setHasOptionsMenu(!mUnavailable);
         if (mUnavailable) {
-            setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
-            getPreferenceScreen().removeAll();
+            addPreferencesFromResource(R.xml.empty_settings);
             return;
         }
 

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;
         }