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

Fix custom restrictions launch mechanism

Browse Source 
Instead of showing a separate entry for launching custom restrictions,
launch it directly when clicking on the settings icon.

Bug: 10388399
Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
This commit is contained in:
Amith Yamasani
2013-08-20 16:26:48 -07:00
parent d3dbc6e3a1
commit d760a61936
1 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private boolean hasSettings; private boolean hasSettings;
private OnClickListener listener; private OnClickListener listener;
private ArrayList<RestrictionEntry> restrictions; private ArrayList<RestrictionEntry> restrictions;
private boolean mPanelOpen; private boolean panelOpen;
private boolean immutable; private boolean immutable;
private List<Preference> mChildren = new ArrayList<Preference>(); private List<Preference> mChildren = new ArrayList<Preference>();
private final ColorFilter grayscaleFilter; private final ColorFilter grayscaleFilter;
@@ -215,7 +215,11 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
} }
boolean isPanelOpen() { boolean isPanelOpen() {
return mPanelOpen; return panelOpen;
}
void setPanelOpen(boolean open) {
panelOpen = open;
} }
List<Preference> getChildren() { List<Preference> getChildren() {
@@ -672,7 +676,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
// able to toggle this app ON (it's ON by default and immutable). // able to toggle this app ON (it's ON by default and immutable).
// Only do this for restricted profiles, not single-user restrictions // Only do this for restricted profiles, not single-user restrictions
if (hasSettings) { if (hasSettings) {
requestRestrictionsForApp(packageName, p); requestRestrictionsForApp(packageName, p, false);
} }
} else if (!mNewUser && isAppEnabledForUser(pi)) { } else if (!mNewUser && isAppEnabledForUser(pi)) {
p.setChecked(true); p.setChecked(true);
@@ -748,7 +752,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
if (v.getTag() instanceof AppRestrictionsPreference) { if (v.getTag() instanceof AppRestrictionsPreference) {
AppRestrictionsPreference pref = (AppRestrictionsPreference) v.getTag(); AppRestrictionsPreference pref = (AppRestrictionsPreference) v.getTag();
if (v.getId() == R.id.app_restrictions_settings) { if (v.getId() == R.id.app_restrictions_settings) {
toggleAppPanel(pref); onAppSettingsIconClicked(pref);
} else if (!pref.isImmutable()) { } else if (!pref.isImmutable()) {
pref.setChecked(!pref.isChecked()); pref.setChecked(!pref.isChecked());
final String packageName = pref.getKey().substring(PKG_PREFIX.length()); final String packageName = pref.getKey().substring(PKG_PREFIX.length());
@@ -756,7 +760,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
if (pref.isChecked() && pref.hasSettings if (pref.isChecked() && pref.hasSettings
&& pref.restrictions == null) { && pref.restrictions == null) {
// The restrictions have not been initialized, get and save them // The restrictions have not been initialized, get and save them
requestRestrictionsForApp(packageName, pref); requestRestrictionsForApp(packageName, pref, false);
} }
mAppListChanged = true; mAppListChanged = true;
// If it's not a restricted profile, apply the changes immediately // If it's not a restricted profile, apply the changes immediately
@@ -817,13 +821,17 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
return true; return true;
} }
private void toggleAppPanel(AppRestrictionsPreference preference) { private void removeRestrictionsForApp(AppRestrictionsPreference preference) {
if (preference.getKey().startsWith(PKG_PREFIX)) {
if (preference.mPanelOpen) {
for (Preference p : preference.mChildren) { for (Preference p : preference.mChildren) {
mAppList.removePreference(p); mAppList.removePreference(p);
} }
preference.mChildren.clear(); preference.mChildren.clear();
}
private void onAppSettingsIconClicked(AppRestrictionsPreference preference) {
if (preference.getKey().startsWith(PKG_PREFIX)) {
if (preference.isPanelOpen()) {
removeRestrictionsForApp(preference);
} else { } else {
String packageName = preference.getKey().substring(PKG_PREFIX.length()); String packageName = preference.getKey().substring(PKG_PREFIX.length());
if (packageName.equals(getActivity().getPackageName())) { if (packageName.equals(getActivity().getPackageName())) {
@@ -832,15 +840,22 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
getActivity(), mUser); getActivity(), mUser);
onRestrictionsReceived(preference, packageName, restrictions); onRestrictionsReceived(preference, packageName, restrictions);
} else { } else {
requestRestrictionsForApp(packageName, preference); requestRestrictionsForApp(packageName, preference, true /*invoke if custom*/);
} }
} }
preference.mPanelOpen = !preference.mPanelOpen; preference.setPanelOpen(!preference.isPanelOpen());
} }
} }
/**
* Send a broadcast to the app to query its restrictions
* @param packageName package name of the app with restrictions
* @param preference the preference item for the app toggle
* @param invokeIfCustom whether to directly launch any custom activity that is returned
* for the app.
*/
private void requestRestrictionsForApp(String packageName, private void requestRestrictionsForApp(String packageName,
AppRestrictionsPreference preference) { AppRestrictionsPreference preference, boolean invokeIfCustom) {
Bundle oldEntries = Bundle oldEntries =
mUserManager.getApplicationRestrictions(packageName, mUser); mUserManager.getApplicationRestrictions(packageName, mUser);
Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES); Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
@@ -848,7 +863,7 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
intent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE, oldEntries); intent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE, oldEntries);
intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES); intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
getActivity().sendOrderedBroadcast(intent, null, getActivity().sendOrderedBroadcast(intent, null,
new RestrictionsResultReceiver(packageName, preference), new RestrictionsResultReceiver(packageName, preference, invokeIfCustom),
null, Activity.RESULT_OK, null, null); null, Activity.RESULT_OK, null, null);
} }
@@ -857,11 +872,14 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
private static final String CUSTOM_RESTRICTIONS_INTENT = Intent.EXTRA_RESTRICTIONS_INTENT; private static final String CUSTOM_RESTRICTIONS_INTENT = Intent.EXTRA_RESTRICTIONS_INTENT;
String packageName; String packageName;
AppRestrictionsPreference preference; AppRestrictionsPreference preference;
boolean invokeIfCustom;
RestrictionsResultReceiver(String packageName, AppRestrictionsPreference preference) { RestrictionsResultReceiver(String packageName, AppRestrictionsPreference preference,
boolean invokeIfCustom) {
super(); super();
this.packageName = packageName; this.packageName = packageName;
this.preference = preference; this.preference = preference;
this.invokeIfCustom = invokeIfCustom;
} }
@Override @Override
@@ -877,34 +895,21 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
RestrictionUtils.restrictionsToBundle(restrictions), mUser); RestrictionUtils.restrictionsToBundle(restrictions), mUser);
} }
} else if (restrictionsIntent != null) { } else if (restrictionsIntent != null) {
final Intent customIntent = restrictionsIntent; preference.setRestrictions(restrictions);
if (restrictions != null) { if (invokeIfCustom && AppRestrictionsFragment.this.isResumed()) {
customIntent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE,
RestrictionUtils.restrictionsToBundle(restrictions));
}
Preference p = new Preference(context);
p.setTitle(R.string.app_restrictions_custom_label);
p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
int requestCode = generateCustomActivityRequestCode( int requestCode = generateCustomActivityRequestCode(
RestrictionsResultReceiver.this.preference); RestrictionsResultReceiver.this.preference);
AppRestrictionsFragment.this.startActivityForResult( AppRestrictionsFragment.this.startActivityForResult(
customIntent, requestCode); restrictionsIntent, requestCode);
return false;
} }
});
p.setPersistent(false);
p.setOrder(preference.getOrder() + 1);
preference.mChildren.add(p);
mAppList.addPreference(p);
preference.setRestrictions(restrictions);
} }
} }
} }
private void onRestrictionsReceived(AppRestrictionsPreference preference, String packageName, private void onRestrictionsReceived(AppRestrictionsPreference preference, String packageName,
ArrayList<RestrictionEntry> restrictions) { ArrayList<RestrictionEntry> restrictions) {
// Remove any earlier restrictions
removeRestrictionsForApp(preference);
// Non-custom-activity case - expand the restrictions in-place // Non-custom-activity case - expand the restrictions in-place
final Context context = preference.getContext(); final Context context = preference.getContext();
int count = 1; int count = 1;
@@ -1004,7 +1009,6 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen
// If there's a valid result, persist it to the user manager. // If there's a valid result, persist it to the user manager.
mUserManager.setApplicationRestrictions(packageName, bundle, mUser); mUserManager.setApplicationRestrictions(packageName, bundle, mUser);
} }
toggleAppPanel(pref);
} }
// Remove request from the map // Remove request from the map
mCustomRequestMap.remove(requestCode); mCustomRequestMap.remove(requestCode);