User management screens
Customized Settings for restricted users
- Only some top-level settings panels available
User management
- Primary user can add and remove users
- User details screen to change name and list of enabled apps
Change-Id: Ia6beb991b427197a4ec2724ca3c9222073f6cf7d
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 622e827..88a2d33 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -26,6 +26,7 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
+import android.os.UserId;
import android.os.Vibrator;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
@@ -140,15 +141,17 @@
DevicePolicyManager dpm =
(DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
- switch (dpm.getStorageEncryptionStatus()) {
- case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
- // The device is currently encrypted.
- addPreferencesFromResource(R.xml.security_settings_encrypted);
- break;
- case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
- // This device supports encryption but isn't encrypted.
- addPreferencesFromResource(R.xml.security_settings_unencrypted);
- break;
+ if (UserId.myUserId() == 0) {
+ switch (dpm.getStorageEncryptionStatus()) {
+ case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
+ // The device is currently encrypted.
+ addPreferencesFromResource(R.xml.security_settings_encrypted);
+ break;
+ case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
+ // This device supports encryption but isn't encrypted.
+ addPreferencesFromResource(R.xml.security_settings_unencrypted);
+ break;
+ }
}
// lock after preference
@@ -190,6 +193,11 @@
}
}
+ if (UserId.myUserId() > 0) {
+ return root;
+ }
+ // Rest are for primary user...
+
// Append the rest of the settings
addPreferencesFromResource(R.xml.security_settings_misc);
@@ -246,7 +254,9 @@
public void onClick(DialogInterface dialog, int which) {
if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
setNonMarketAppsAllowed(true);
- mToggleAppInstallation.setChecked(true);
+ if (mToggleAppInstallation != null) {
+ mToggleAppInstallation.setChecked(true);
+ }
}
}
@@ -343,11 +353,15 @@
mPowerButtonInstantlyLocks.setChecked(lockPatternUtils.getPowerButtonInstantlyLocks());
}
- mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
- Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
+ if (mShowPassword != null) {
+ mShowPassword.setChecked(Settings.System.getInt(getContentResolver(),
+ Settings.System.TEXT_SHOW_PASSWORD, 1) != 0);
+ }
KeyStore.State state = KeyStore.getInstance().state();
- mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED);
+ if (mResetCredentials != null) {
+ mResetCredentials.setEnabled(state != KeyStore.State.UNINITIALIZED);
+ }
}
@Override
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index eb30809..7e4e725 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,6 +16,7 @@
package com.android.settings;
+import com.android.internal.util.ArrayUtils;
import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.deviceinfo.Memory;
@@ -29,6 +30,7 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
+import android.os.UserId;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceFragment;
@@ -76,6 +78,17 @@
private Header mParentHeader;
private boolean mInLocalHeaderSwitch;
+ // Show only these settings for restricted users
+ private int[] SETTINGS_FOR_RESTRICTED = {
+ R.id.wifi_settings,
+ R.id.bluetooth_settings,
+ R.id.sound_settings,
+ R.id.display_settings,
+ //R.id.security_settings,
+ R.id.sync_settings,
+ R.id.about_settings
+ };
+
// TODO: Update Call Settings based on airplane mode state.
protected HashMap<Integer, Integer> mHeaderIndexMap = new HashMap<Integer, Integer>();
@@ -337,6 +350,16 @@
if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
target.remove(header);
}
+ } else if (id == R.id.user_settings) {
+ if (!UserId.MU_ENABLED || UserId.myUserId() != 0
+ || !getResources().getBoolean(R.bool.enable_user_management)
+ || Utils.isMonkeyRunning()) {
+ target.remove(header);
+ }
+ }
+ if (UserId.MU_ENABLED && UserId.myUserId() != 0
+ && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
+ target.remove(header);
}
// Increment if the current one wasn't removed by the Utils code.
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
new file mode 100644
index 0000000..84cabe9
--- /dev/null
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.SystemProperties;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.Preference;
+import android.preference.PreferenceGroup;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.HashMap;
+import java.util.List;
+
+public class UserDetailsSettings extends SettingsPreferenceFragment
+ implements Preference.OnPreferenceChangeListener, DialogCreatable {
+
+ private static final String TAG = "UserDetailsSettings";
+
+ private static final int MENU_REMOVE_USER = Menu.FIRST;
+ private static final int DIALOG_CONFIRM_REMOVE = 1;
+
+ private static final String KEY_USER_NAME = "user_name";
+ private static final String KEY_INSTALLED_APPS = "market_apps_category";
+ private static final String KEY_SYSTEM_APPS = "system_apps_category";
+ public static final String EXTRA_USER_ID = "user_id";
+
+ private static final String[] SYSTEM_APPS = {
+ "com.google.android.browser",
+ "com.google.android.gm",
+ "com.google.android.youtube"
+ };
+
+ static class AppState {
+ boolean dirty;
+ boolean enabled;
+
+ AppState(boolean enabled) {
+ this.enabled = enabled;
+ }
+ }
+
+ private HashMap<String, AppState> mAppStates = new HashMap<String, AppState>();
+ private PreferenceGroup mSystemAppGroup;
+ private PreferenceGroup mInstalledAppGroup;
+ private EditTextPreference mNamePref;
+
+ private IPackageManager mIPm;
+ private PackageManager mPm;
+ private int mUserId;
+ private boolean mNewUser;
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ addPreferencesFromResource(R.xml.user_details);
+ Bundle args = getArguments();
+ mNewUser = args == null || args.getInt(EXTRA_USER_ID, -1) == -1;
+ mUserId = mNewUser ? -1 : args.getInt(EXTRA_USER_ID, -1);
+ mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+
+ if (mUserId == -1) {
+ try {
+ mUserId = mIPm.createUser(getString(R.string.user_new_user_name), 0).id;
+ } catch (RemoteException re) {
+ }
+ }
+ mSystemAppGroup = (PreferenceGroup) findPreference(KEY_SYSTEM_APPS);
+ mInstalledAppGroup = (PreferenceGroup) findPreference(KEY_INSTALLED_APPS);
+ mNamePref = (EditTextPreference) findPreference(KEY_USER_NAME);
+ mNamePref.setOnPreferenceChangeListener(this);
+
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mPm = getActivity().getPackageManager();
+ if (mUserId > 0) {
+ initExistingUser();
+ } else {
+ initNewUser();
+ }
+ refreshApps();
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ MenuItem addAccountItem = menu.add(0, MENU_REMOVE_USER, 0,
+ mNewUser ? R.string.user_discard_user_menu : R.string.user_remove_user_menu);
+ addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+ | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ final int itemId = item.getItemId();
+ if (itemId == MENU_REMOVE_USER) {
+ onRemoveUserClicked();
+ return true;
+ } else {
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+ private void initExistingUser() {
+ List<UserInfo> users = mPm.getUsers();
+ UserInfo foundUser = null;
+ for (UserInfo user : users) {
+ if (user.id == mUserId) {
+ foundUser = user;
+ break;
+ }
+ }
+ if (foundUser != null) {
+ mNamePref.setSummary(foundUser.name);
+ mNamePref.setText(foundUser.name);
+ }
+ }
+
+ private void initNewUser() {
+ // TODO: Check if there's already a "New user" and localize
+ mNamePref.setText(getString(R.string.user_new_user_name));
+ mNamePref.setSummary(getString(R.string.user_new_user_name));
+ }
+
+ private void onRemoveUserClicked() {
+ if (mNewUser) {
+ removeUserNow();
+ } else {
+ showDialog(DIALOG_CONFIRM_REMOVE);
+ }
+ }
+
+ private void removeUserNow() {
+ try {
+ mIPm.removeUser(mUserId);
+ } catch (RemoteException re) {
+ // Couldn't remove user. Shouldn't happen
+ Log.e(TAG, "Couldn't remove user " + mUserId + "\n" + re);
+ }
+ finish();
+ }
+
+ private void insertAppInfo(PreferenceGroup group, HashMap<String, AppState> appStateMap,
+ PackageInfo info, boolean defaultState) {
+ if (info != null) {
+ String pkgName = info.packageName;
+ String name = info.applicationInfo.loadLabel(mPm).toString();
+ Drawable icon = info.applicationInfo.loadIcon(mPm);
+ AppState appState = appStateMap.get(info.packageName);
+ boolean enabled = appState == null ? defaultState : appState.enabled;
+ CheckBoxPreference appPref = new CheckBoxPreference(getActivity());
+ appPref.setTitle(name != null ? name : pkgName);
+ appPref.setIcon(icon);
+ appPref.setChecked(enabled);
+ appPref.setKey(pkgName);
+ appPref.setPersistent(false);
+ appPref.setOnPreferenceChangeListener(this);
+ group.addPreference(appPref);
+ }
+ }
+
+ private void refreshApps() {
+ mSystemAppGroup.removeAll();
+ mInstalledAppGroup.removeAll();
+
+ boolean firstTime = mAppStates.isEmpty();
+
+ final Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
+ mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+ List<ResolveInfo> apps = mPm.queryIntentActivities(mainIntent, 0);
+
+ for (ResolveInfo resolveInfo : apps) {
+ PackageInfo info;
+ try {
+ info = mIPm.getPackageInfo(resolveInfo.activityInfo.packageName,
+ 0 /* flags */,
+ mUserId < 0 ? 0 : mUserId);
+ } catch (RemoteException re) {
+ continue;
+ }
+ if (firstTime) {
+ mAppStates.put(resolveInfo.activityInfo.packageName,
+ new AppState(info.applicationInfo.enabled));
+ }
+ if ((info.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
+ if (mSystemAppGroup.findPreference(info.packageName) != null) {
+ continue;
+ }
+ insertAppInfo(mSystemAppGroup, mAppStates, info, false);
+ } else {
+ if (mInstalledAppGroup.findPreference(info.packageName) != null) {
+ continue;
+ }
+ insertAppInfo(mInstalledAppGroup, mAppStates, info, false);
+ }
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (preference instanceof CheckBoxPreference) {
+ String packageName = preference.getKey();
+ int newState = ((Boolean) newValue) ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+ : PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
+ try {
+ mIPm.setApplicationEnabledSetting(packageName, newState, 0, mUserId);
+ } catch (RemoteException re) {
+ Log.e(TAG, "Unable to change enabled state of package " + packageName
+ + " for user " + mUserId);
+ }
+ } else if (preference == mNamePref) {
+ String name = (String) newValue;
+ if (TextUtils.isEmpty(name)) {
+ return false;
+ }
+ try {
+ mIPm.updateUserName(mUserId, (String) newValue);
+ mNamePref.setSummary((String) newValue);
+ } catch (RemoteException re) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public Dialog onCreateDialog(int dialogId) {
+ switch (dialogId) {
+ case DIALOG_CONFIRM_REMOVE:
+ return new AlertDialog.Builder(getActivity())
+ .setTitle(R.string.user_confirm_remove_title)
+ .setMessage(R.string.user_confirm_remove_message)
+ .setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ removeUserNow();
+ }
+ })
+ .setNegativeButton(android.R.string.cancel, null)
+ .create();
+ default:
+ return null;
+ }
+ }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
new file mode 100644
index 0000000..9380586
--- /dev/null
+++ b/src/com/android/settings/users/UserSettings.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceGroup;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.List;
+
+public class UserSettings extends SettingsPreferenceFragment
+ implements OnPreferenceClickListener {
+
+ private static final String KEY_USER_LIST = "user_list";
+ private static final int MENU_ADD_USER = Menu.FIRST;
+
+ private PreferenceGroup mUserListCategory;
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ addPreferencesFromResource(R.xml.user_settings);
+ mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST);
+
+ setHasOptionsMenu(true);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ updateUserList();
+ }
+
+ @Override
+ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ MenuItem addAccountItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
+ addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+ | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ final int itemId = item.getItemId();
+ if (itemId == MENU_ADD_USER) {
+ onAddUserClicked();
+ return true;
+ } else {
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+ private void onAddUserClicked() {
+ ((PreferenceActivity) getActivity()).startPreferencePanel(
+ UserDetailsSettings.class.getName(), null, R.string.user_details_title,
+ null, this, 0);
+ }
+
+ private void updateUserList() {
+ List<UserInfo> users = getActivity().getPackageManager().getUsers();
+
+ mUserListCategory.removeAll();
+ for (UserInfo user : users) {
+ if (user.id == 0) continue;
+ Preference pref = new Preference(getActivity());
+ pref.setTitle(user.name);
+ pref.setOnPreferenceClickListener(this);
+ pref.setKey("id=" + user.id);
+ mUserListCategory.addPreference(pref);
+ }
+ }
+
+ @Override
+ public boolean onPreferenceClick(Preference pref) {
+ String sid = pref.getKey();
+ if (sid != null && sid.startsWith("id=")) {
+ int id = Integer.parseInt(sid.substring(3));
+ Bundle args = new Bundle();
+ args.putInt(UserDetailsSettings.EXTRA_USER_ID, id);
+ ((PreferenceActivity) getActivity()).startPreferencePanel(
+ UserDetailsSettings.class.getName(),
+ args, 0, pref.getTitle(), this, 0);
+ return true;
+ }
+ return false;
+ }
+}