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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-11 23:43:26 +00:00
committed by Android (Google) Code Review
parent d70abb53ee 76f46fc869
commit 69faf046c0
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/ApnSettings.java
View File

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

2
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -396,7 +396,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;
}