Merge "Save app toggle state as soon as possible" into jb-mr2-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e5ba5a8..1b46954 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4328,6 +4328,10 @@
<string name="user_add_user_menu">Add user or profile</string>
<!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
<string name="user_summary_restricted_profile">Restricted profile</string>
+ <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+ <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
+ <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+ <string name="user_set_lock_button">Set lock</string>
<!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
<string name="user_summary_not_set_up">Not set up</string>
<!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 4237f22..f4e8d2c 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -26,6 +26,7 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.RestrictionEntry;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
@@ -141,6 +142,20 @@
private EditUserPhotoController mEditUserPhotoController;
+ private BroadcastReceiver mUserBackgrounding = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ // Update the user's app selection right away without waiting for a pause
+ // onPause() might come in too late, causing apps to disappear after broadcasts
+ // have been scheduled during user startup.
+ if (mAppListChanged) {
+ if (DEBUG) Log.d(TAG, "User backgrounding, update app list");
+ updateUserAppList();
+ if (DEBUG) Log.d(TAG, "User backgrounding, done updating app list");
+ }
+ }
+ };
+
static class SelectableAppInfo {
String packageName;
CharSequence appName;
@@ -257,7 +272,6 @@
super.onCreate(icicle);
if (icicle != null) {
- mNewUser = icicle.getBoolean(EXTRA_NEW_USER, false);
mUser = new UserHandle(icicle.getInt(EXTRA_USER_ID));
} else {
Bundle args = getArguments();
@@ -292,12 +306,13 @@
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
- outState.putBoolean(EXTRA_NEW_USER, mNewUser);
outState.putInt(EXTRA_USER_ID, mUser.getIdentifier());
}
public void onResume() {
super.onResume();
+ getActivity().registerReceiver(mUserBackgrounding,
+ new IntentFilter(Intent.ACTION_USER_BACKGROUND));
mAppListChanged = false;
new AppLoadingTask().execute((Void[]) null);
@@ -311,6 +326,8 @@
public void onPause() {
super.onPause();
+ mNewUser = false;
+ getActivity().unregisterReceiver(mUserBackgrounding);
if (mAppListChanged) {
new Thread() {
public void run() {
@@ -336,6 +353,9 @@
ApplicationInfo info = ipm.getApplicationInfo(packageName, 0, userId);
if (info == null || info.enabled == false) {
ipm.installExistingPackageAsUser(packageName, mUser.getIdentifier());
+ if (DEBUG) {
+ Log.d(TAG, "Installing " + packageName);
+ }
}
} catch (RemoteException re) {
}
@@ -346,6 +366,9 @@
if (info != null) {
ipm.deletePackageAsUser(entry.getKey(), null, mUser.getIdentifier(),
PackageManager.DELETE_SYSTEM_APP);
+ if (DEBUG) {
+ Log.d(TAG, "Uninstalling " + packageName);
+ }
}
} catch (RemoteException re) {
}
@@ -597,6 +620,12 @@
i++;
}
}
+ // If this is the first time for a new profile, install/uninstall default apps for profile
+ // to avoid taking the hit in onPause(), which can cause race conditions on user switch.
+ if (mNewUser && mFirstTime) {
+ mFirstTime = false;
+ updateUserAppList();
+ }
}
private class AppLabelComparator implements Comparator<SelectableAppInfo> {
@@ -648,8 +677,13 @@
toggleAppPanel(pref);
} else if (!pref.isImmutable()) {
pref.setChecked(!pref.isChecked());
- mSelectedPackages.put(pref.getKey().substring(PKG_PREFIX.length()),
- pref.isChecked());
+ final String packageName = pref.getKey().substring(PKG_PREFIX.length());
+ mSelectedPackages.put(packageName, pref.isChecked());
+ if (pref.isChecked() && pref.hasSettings
+ && pref.restrictions == null) {
+ // The restrictions have not been initialized, get and save them
+ requestRestrictionsForApp(packageName, pref);
+ }
mAppListChanged = true;
updateAllEntries(pref.getKey(), pref.isChecked());
}
@@ -722,21 +756,26 @@
getActivity(), mUser);
onRestrictionsReceived(preference, packageName, restrictions);
} else {
- Bundle oldEntries =
- mUserManager.getApplicationRestrictions(packageName, mUser);
- Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
- intent.setPackage(packageName);
- intent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE, oldEntries);
- intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
- getActivity().sendOrderedBroadcast(intent, null,
- new RestrictionsResultReceiver(packageName, preference),
- null, Activity.RESULT_OK, null, null);
+ requestRestrictionsForApp(packageName, preference);
}
}
preference.panelOpen = !preference.panelOpen;
}
}
+ private void requestRestrictionsForApp(String packageName,
+ AppRestrictionsPreference preference) {
+ Bundle oldEntries =
+ mUserManager.getApplicationRestrictions(packageName, mUser);
+ Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
+ intent.setPackage(packageName);
+ intent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE, oldEntries);
+ intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+ getActivity().sendOrderedBroadcast(intent, null,
+ new RestrictionsResultReceiver(packageName, preference),
+ null, Activity.RESULT_OK, null, null);
+ }
+
class RestrictionsResultReceiver extends BroadcastReceiver {
private static final String CUSTOM_RESTRICTIONS_INTENT = Intent.EXTRA_RESTRICTIONS_INTENT;