<!-- WIRELESS and NETWORKS -->
- <header android:title="@string/header_category_wireless_networks" />
+ <header android:id="@+id/wireless_section"
+ android:title="@string/header_category_wireless_networks" />
<!-- Wifi -->
<header
android:icon="@drawable/empty_icon" />
<!-- DEVICE -->
- <header android:title="@string/header_category_device" />
+ <header android:id="@+id/device_section"
+ android:title="@string/header_category_device" />
<!-- Sound -->
<header
android:title="@string/applications_settings"
android:id="@+id/application_settings" />
+ <!-- Manage users -->
+ <header
+ android:fragment="com.android.settings.users.UserSettings"
+ android:icon="@drawable/ic_settings_sync"
+ android:title="@string/user_settings_title"
+ android:id="@+id/user_settings" />
+
<!-- Manufacturer hook -->
<header
android:fragment="com.android.settings.WirelessSettings"
<!-- PERSONAL -->
- <header android:title="@string/header_category_personal" />
+ <header android:id="@+id/personal_section"
+ android:title="@string/header_category_personal" />
<!-- Location -->
<header
android:id="@+id/account_settings"
android:title="@string/account_settings" />
- <!-- Manage users -->
- <header
- android:fragment="com.android.settings.users.UserSettings"
- android:icon="@drawable/ic_settings_sync"
- android:title="@string/user_settings_title"
- android:id="@+id/user_settings" />
-
<header
android:id="@+id/account_add"
android:title="@string/add_account_label"
</header>
<!-- SYSTEM -->
- <header android:title="@string/header_category_system" />
+ <header android:id="@+id/system_section"
+ android:title="@string/header_category_system" />
<!-- Dock -->
<header
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
+import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.UserManager;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.Preference;
private IPackageManager mIPm;
private PackageManager mPm;
+ private UserManager mUm;
private int mUserId;
private boolean mNewUser;
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"));
+ mUm = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
if (mUserId == -1) {
- try {
- mUserId = mIPm.createUser(getString(R.string.user_new_user_name), 0).id;
- } catch (RemoteException re) {
- }
+ mUserId = mUm.createUser(getString(R.string.user_new_user_name), 0).id;
}
mSystemAppGroup = (PreferenceGroup) findPreference(KEY_SYSTEM_APPS);
mInstalledAppGroup = (PreferenceGroup) findPreference(KEY_INSTALLED_APPS);
}
private void initExistingUser() {
- List<UserInfo> users = mPm.getUsers();
+ List<UserInfo> users = mUm.getUsers();
UserInfo foundUser = null;
for (UserInfo user : users) {
if (user.id == mUserId) {
}
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);
- }
+ mUm.removeUser(mUserId);
finish();
}
if (TextUtils.isEmpty(name)) {
return false;
}
- try {
- mIPm.setUserName(mUserId, (String) newValue);
- mNamePref.setSummary((String) newValue);
- } catch (RemoteException re) {
- return false;
- }
+ mUm.setUserName(mUserId, (String) newValue);
+ mNamePref.setSummary((String) newValue);
}
return true;
}
}
private void saveCroppedImage(Intent data) {
- try {
- if (data.hasExtra("data")) {
- Bitmap bitmap = (Bitmap) data.getParcelableExtra("data");
- ParcelFileDescriptor fd = mIPm.setUserIcon(mUserId);
- if (fd != null) {
- bitmap.compress(CompressFormat.PNG, 100,
- new ParcelFileDescriptor.AutoCloseOutputStream(fd));
- setPhotoId(mPm.getUser(mUserId).iconPath);
- }
+ if (data.hasExtra("data")) {
+ Bitmap bitmap = (Bitmap) data.getParcelableExtra("data");
+ ParcelFileDescriptor fd = mUm.setUserIcon(mUserId);
+ if (fd != null) {
+ bitmap.compress(CompressFormat.PNG, 100,
+ new ParcelFileDescriptor.AutoCloseOutputStream(fd));
+ setPhotoId(mUm.getUserInfo(mUserId).iconPath);
}
- } catch (RemoteException re) {
}
}
package com.android.settings.users;
+import android.content.Context;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.os.UserManager;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceActivity;
}
private void updateUserList() {
- List<UserInfo> users = getActivity().getPackageManager().getUsers();
+ List<UserInfo> users = ((UserManager) getActivity().getSystemService(Context.USER_SERVICE))
+ .getUsers();
mUserListCategory.removeAll();
for (UserInfo user : users) {