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

Make sure Settings app restrictions show up

Browse Source 
Inadvertently disabled that in the previous change where we would
skip apps that were required but had no restrictions entries.

Bug: 8520185
Change-Id: Idc1808e489f7b6da267f68a2c7cef81cc351d2d0
This commit is contained in:
Amith Yamasani
2013-04-11 11:12:35 -07:00
parent 3c3fa0ccb8
commit d8b0d0ed8e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/AppRestrictionsFragment.java
View File

@@ -341,6 +341,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
for (SelectableAppInfo app : visibleApps) { for (SelectableAppInfo app : visibleApps) {
String packageName = app.packageName; String packageName = app.packageName;
if (packageName == null) continue; if (packageName == null) continue;
final boolean isSettingsApp = packageName.equals(getActivity().getPackageName());
AppRestrictionsPreference p = new AppRestrictionsPreference(context, this); AppRestrictionsPreference p = new AppRestrictionsPreference(context, this);
final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName); final boolean hasSettings = resolveInfoListHasPackage(receivers, packageName);
p.setIcon(app.icon); p.setIcon(app.icon);
@@ -350,8 +351,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
app.masterEntry.activityName)); app.masterEntry.activityName));
} }
p.setKey(PKG_PREFIX + packageName); p.setKey(PKG_PREFIX + packageName);
p.setSettingsEnabled(hasSettings p.setSettingsEnabled(hasSettings || isSettingsApp);
|| packageName.equals(getActivity().getPackageName()));
p.setPersistent(false); p.setPersistent(false);
p.setOnPreferenceChangeListener(this); p.setOnPreferenceChangeListener(this);
p.setOnPreferenceClickListener(this); p.setOnPreferenceClickListener(this);
@@ -368,7 +368,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
p.setChecked(true); p.setChecked(true);
p.setImmutable(true); p.setImmutable(true);
// If the app is required and has no restrictions, skip showing it // If the app is required and has no restrictions, skip showing it
if (!hasSettings) continue; if (!hasSettings && !isSettingsApp) continue;
} else if (!mNewUser && appInfoListHasPackage(userApps, packageName)) { } else if (!mNewUser && appInfoListHasPackage(userApps, packageName)) {
p.setChecked(true); p.setChecked(true);
} }
@@ -377,7 +377,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
p.setChecked(mSelectedPackages.get(packageName)); p.setChecked(mSelectedPackages.get(packageName));
} }
mAppList.addPreference(p); mAppList.addPreference(p);
if (packageName.equals(getActivity().getPackageName())) { if (isSettingsApp) {
p.setOrder(MAX_APP_RESTRICTIONS * 1); p.setOrder(MAX_APP_RESTRICTIONS * 1);
} else { } else {
p.setOrder(MAX_APP_RESTRICTIONS * (i + 2)); p.setOrder(MAX_APP_RESTRICTIONS * (i + 2));