Merge "Update fuelguage to use uid in AppInfo" into pi-dev
diff --git a/res/xml/accounts_dashboard_settings.xml b/res/xml/accounts_dashboard_settings.xml
index 1e29d0a..6b5f825 100644
--- a/res/xml/accounts_dashboard_settings.xml
+++ b/res/xml/accounts_dashboard_settings.xml
@@ -23,6 +23,25 @@
<PreferenceCategory
android:key="dashboard_tile_placeholder"
- android:order="200"/>
+ android:order="30"/>
+
+ <SwitchPreference
+ android:key="auto_sync_account_data"
+ android:title="@string/auto_sync_account_title"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="102"
+ settings:allowDividerAbove="true"/>
+
+ <SwitchPreference
+ android:key="auto_sync_work_account_data"
+ android:title="@string/account_settings_menu_auto_sync_work"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="103"/>
+
+ <SwitchPreference
+ android:key="auto_sync_personal_account_data"
+ android:title="@string/account_settings_menu_auto_sync_personal"
+ android:summary="@string/auto_sync_account_summary"
+ android:order="104"/>
</PreferenceScreen>
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 227dee2..9b84a43 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -28,13 +28,15 @@
android:key="saved_device_list"
android:title="@string/connected_device_saved_title"/>
- <Preference
+ <com.android.settingslib.RestrictedPreference
android:fragment="com.android.settings.bluetooth.BluetoothPairingDetail"
android:key="add_bt_devices"
android:title="@string/connected_device_add_device_title"
android:icon="@drawable/ic_menu_add"
android:summary="@string/connected_device_add_device_summary"
- settings:allowDividerAbove="true"/>
+ settings:allowDividerAbove="true"
+ settings:userRestriction="no_config_bluetooth"
+ settings:useAdminDisabledSummary="true"/>
<Preference
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 32b46d9..7fa735d 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -16,7 +16,6 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="user_settings_screen"
android:title="@string/user_settings_title">
@@ -32,25 +31,6 @@
android:icon="@drawable/ic_menu_add"
android:order="20"/>
- <SwitchPreference
- android:key="auto_sync_account_data"
- android:title="@string/auto_sync_account_title"
- android:summary="@string/auto_sync_account_summary"
- android:order="102"
- settings:allowDividerAbove="true"/>
-
- <SwitchPreference
- android:key="auto_sync_work_account_data"
- android:title="@string/account_settings_menu_auto_sync_work"
- android:summary="@string/auto_sync_account_summary"
- android:order="103"/>
-
- <SwitchPreference
- android:key="auto_sync_personal_account_data"
- android:title="@string/account_settings_menu_auto_sync_personal"
- android:summary="@string/auto_sync_account_summary"
- android:order="104"/>
-
<com.android.settingslib.RestrictedSwitchPreference
android:key="user_settings_add_users_when_locked"
android:title="@string/user_add_on_lockscreen_menu"
diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java
index cab5dab..b976940 100644
--- a/src/com/android/settings/accounts/AccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -29,6 +29,9 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.users.AutoSyncDataPreferenceController;
+import com.android.settings.users.AutoSyncPersonalDataPreferenceController;
+import com.android.settings.users.AutoSyncWorkDataPreferenceController;
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -69,6 +72,9 @@
new AccountPreferenceController(context, this, authorities);
getLifecycle().addObserver(accountPrefController);
controllers.add(accountPrefController);
+ controllers.add(new AutoSyncDataPreferenceController(context, this /*parent */));
+ controllers.add(new AutoSyncPersonalDataPreferenceController(context, this /*parent */));
+ controllers.add(new AutoSyncWorkDataPreferenceController(context, this /* parent */));
return controllers;
}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 4ca7e63..bc02b30 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -148,9 +148,6 @@
private EditUserInfoController mEditUserInfoController = new EditUserInfoController();
private AddUserWhenLockedPreferenceController mAddUserWhenLockedPreferenceController;
- private AutoSyncDataPreferenceController mAutoSyncDataPreferenceController;
- private AutoSyncPersonalDataPreferenceController mAutoSyncPersonalDataPreferenceController;
- private AutoSyncWorkDataPreferenceController mAutoSyncWorkDataPreferenceController;
// A place to cache the generated default avatar
private Drawable mDefaultIconDrawable;
@@ -159,15 +156,15 @@
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
- case MESSAGE_UPDATE_LIST:
- updateUserList();
- break;
- case MESSAGE_SETUP_USER:
- onUserCreated(msg.arg1);
- break;
- case MESSAGE_CONFIG_USER:
- onManageUserClicked(msg.arg1, true);
- break;
+ case MESSAGE_UPDATE_LIST:
+ updateUserList();
+ break;
+ case MESSAGE_SETUP_USER:
+ onUserCreated(msg.arg1);
+ break;
+ case MESSAGE_CONFIG_USER:
+ onManageUserClicked(msg.arg1, true);
+ break;
}
}
};
@@ -203,17 +200,9 @@
final Context context = getActivity();
mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
context, KEY_ADD_USER_WHEN_LOCKED, getLifecycle());
- mAutoSyncDataPreferenceController = new AutoSyncDataPreferenceController(context, this);
- mAutoSyncPersonalDataPreferenceController =
- new AutoSyncPersonalDataPreferenceController(context, this);
- mAutoSyncWorkDataPreferenceController =
- new AutoSyncWorkDataPreferenceController(context, this);
-
final PreferenceScreen screen = getPreferenceScreen();
mAddUserWhenLockedPreferenceController.displayPreference(screen);
- mAutoSyncDataPreferenceController.displayPreference(screen);
- mAutoSyncPersonalDataPreferenceController.displayPreference(screen);
- mAutoSyncWorkDataPreferenceController.displayPreference(screen);
+
screen.findPreference(mAddUserWhenLockedPreferenceController.getPreferenceKey())
.setOnPreferenceChangeListener(mAddUserWhenLockedPreferenceController);
@@ -274,22 +263,10 @@
}
final PreferenceScreen screen = getPreferenceScreen();
- if (mAutoSyncDataPreferenceController.isAvailable()) {
- mAutoSyncDataPreferenceController.updateState(screen.findPreference(
- mAutoSyncDataPreferenceController.getPreferenceKey()));
- }
if (mAddUserWhenLockedPreferenceController.isAvailable()) {
mAddUserWhenLockedPreferenceController.updateState(screen.findPreference(
mAddUserWhenLockedPreferenceController.getPreferenceKey()));
}
- if (mAutoSyncPersonalDataPreferenceController.isAvailable()) {
- mAutoSyncPersonalDataPreferenceController.updateState(screen.findPreference(
- mAutoSyncPersonalDataPreferenceController.getPreferenceKey()));
- }
- if (mAutoSyncWorkDataPreferenceController.isAvailable()) {
- mAutoSyncWorkDataPreferenceController.updateState(screen.findPreference(
- mAutoSyncWorkDataPreferenceController.getPreferenceKey()));
- }
if (mShouldUpdateUserList) {
mUserCaps.updateAddUserCapabilities(getActivity());
@@ -330,20 +307,6 @@
}
@Override
- public boolean onPreferenceTreeClick(Preference preference) {
- if (mAutoSyncDataPreferenceController.handlePreferenceTreeClick(preference)) {
- return true;
- }
- if (mAutoSyncPersonalDataPreferenceController.handlePreferenceTreeClick(preference)) {
- return true;
- }
- if (mAutoSyncWorkDataPreferenceController.handlePreferenceTreeClick(preference)) {
- return true;
- }
- return super.onPreferenceTreeClick(preference);
- }
-
- @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
int pos = 0;
UserManager um = getContext().getSystemService(UserManager.class);
@@ -438,16 +401,16 @@
synchronized (mUserLock) {
if (mRemovingUserId == -1 && !mAddingUser) {
switch (userType) {
- case USER_TYPE_USER:
- showDialog(DIALOG_ADD_USER);
- break;
- case USER_TYPE_RESTRICTED_PROFILE:
- if (hasLockscreenSecurity()) {
- addUserNow(USER_TYPE_RESTRICTED_PROFILE);
- } else {
- showDialog(DIALOG_NEED_LOCKSCREEN);
- }
- break;
+ case USER_TYPE_USER:
+ showDialog(DIALOG_ADD_USER);
+ break;
+ case USER_TYPE_RESTRICTED_PROFILE:
+ if (hasLockscreenSecurity()) {
+ addUserNow(USER_TYPE_RESTRICTED_PROFILE);
+ } else {
+ showDialog(DIALOG_NEED_LOCKSCREEN);
+ }
+ break;
}
}
}
@@ -556,9 +519,9 @@
}
case DIALOG_USER_CANNOT_MANAGE:
return new AlertDialog.Builder(context)
- .setMessage(R.string.user_cannot_manage_message)
- .setPositiveButton(android.R.string.ok, null)
- .create();
+ .setMessage(R.string.user_cannot_manage_message)
+ .setPositiveButton(android.R.string.ok, null)
+ .create();
case DIALOG_ADD_USER: {
final SharedPreferences preferences = getActivity().getPreferences(
Context.MODE_PRIVATE);
@@ -570,55 +533,56 @@
final int userType = dialogId == DIALOG_ADD_USER
? USER_TYPE_USER : USER_TYPE_RESTRICTED_PROFILE;
Dialog dlg = new AlertDialog.Builder(context)
- .setTitle(R.string.user_add_user_title)
- .setMessage(messageResId)
- .setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- addUserNow(userType);
- if (!longMessageDisplayed) {
- preferences.edit().putBoolean(
- KEY_ADD_USER_LONG_MESSAGE_DISPLAYED, true).apply();
- }
- }
- })
- .setNegativeButton(android.R.string.cancel, null)
- .create();
+ .setTitle(R.string.user_add_user_title)
+ .setMessage(messageResId)
+ .setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ addUserNow(userType);
+ if (!longMessageDisplayed) {
+ preferences.edit().putBoolean(
+ KEY_ADD_USER_LONG_MESSAGE_DISPLAYED,
+ true).apply();
+ }
+ }
+ })
+ .setNegativeButton(android.R.string.cancel, null)
+ .create();
return dlg;
}
case DIALOG_SETUP_USER: {
Dialog dlg = new AlertDialog.Builder(context)
- .setTitle(R.string.user_setup_dialog_title)
- .setMessage(R.string.user_setup_dialog_message)
- .setPositiveButton(R.string.user_setup_button_setup_now,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- switchUserNow(mAddedUserId);
- }
- })
- .setNegativeButton(R.string.user_setup_button_setup_later, null)
- .create();
+ .setTitle(R.string.user_setup_dialog_title)
+ .setMessage(R.string.user_setup_dialog_message)
+ .setPositiveButton(R.string.user_setup_button_setup_now,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ switchUserNow(mAddedUserId);
+ }
+ })
+ .setNegativeButton(R.string.user_setup_button_setup_later, null)
+ .create();
return dlg;
}
case DIALOG_SETUP_PROFILE: {
Dialog dlg = new AlertDialog.Builder(context)
- .setMessage(R.string.user_setup_profile_dialog_message)
- .setPositiveButton(android.R.string.ok,
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- switchUserNow(mAddedUserId);
- }
- })
- .setNegativeButton(android.R.string.cancel, null)
- .create();
+ .setMessage(R.string.user_setup_profile_dialog_message)
+ .setPositiveButton(android.R.string.ok,
+ new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int which) {
+ switchUserNow(mAddedUserId);
+ }
+ })
+ .setNegativeButton(android.R.string.cancel, null)
+ .create();
return dlg;
}
case DIALOG_CHOOSE_USER_TYPE: {
- List<HashMap<String, String>> data = new ArrayList<HashMap<String,String>>();
- HashMap<String,String> addUserItem = new HashMap<String,String>();
+ List<HashMap<String, String>> data = new ArrayList<HashMap<String, String>>();
+ HashMap<String, String> addUserItem = new HashMap<String, String>();
addUserItem.put(KEY_TITLE, getString(R.string.user_add_user_item_title));
addUserItem.put(KEY_SUMMARY, getString(R.string.user_add_user_item_summary));
- HashMap<String,String> addProfileItem = new HashMap<String,String>();
+ HashMap<String, String> addProfileItem = new HashMap<String, String>();
addProfileItem.put(KEY_TITLE, getString(R.string.user_add_profile_item_title));
addProfileItem.put(KEY_SUMMARY, getString(R.string.user_add_profile_item_summary));
data.add(addUserItem);
@@ -891,7 +855,7 @@
// Add a virtual Guest user for guest defaults
UserPreference pref = new UserPreference(getPrefContext(), null,
UserPreference.USERID_GUEST_DEFAULTS,
- mUserCaps.mIsAdmin && voiceCapable? this : null /* settings icon handler */,
+ mUserCaps.mIsAdmin && voiceCapable ? this : null /* settings icon handler */,
null /* delete icon handler */);
pref.setTitle(R.string.user_guest);
pref.setIcon(getEncircledDefaultIcon());
@@ -1061,20 +1025,20 @@
if (v.getTag() instanceof UserPreference) {
int userId = ((UserPreference) v.getTag()).getUserId();
switch (v.getId()) {
- case UserPreference.DELETE_ID:
- final EnforcedAdmin removeDisallowedAdmin =
- RestrictedLockUtils.checkIfRestrictionEnforced(getContext(),
- UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
- if (removeDisallowedAdmin != null) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
- removeDisallowedAdmin);
- } else {
- onRemoveUserClicked(userId);
- }
- break;
- case UserPreference.SETTINGS_ID:
- onManageUserClicked(userId, false);
- break;
+ case UserPreference.DELETE_ID:
+ final EnforcedAdmin removeDisallowedAdmin =
+ RestrictedLockUtils.checkIfRestrictionEnforced(getContext(),
+ UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
+ if (removeDisallowedAdmin != null) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
+ removeDisallowedAdmin);
+ } else {
+ onRemoveUserClicked(userId);
+ }
+ break;
+ case UserPreference.SETTINGS_ID:
+ onManageUserClicked(userId, false);
+ break;
}
}
}
@@ -1106,8 +1070,9 @@
* Returns a default user icon (as a {@link Bitmap}) for the given user.
*
* Note that for guest users, you should pass in {@code UserHandle.USER_NULL}.
+ *
* @param resources resources object to fetch the user icon.
- * @param userId the user id or {@code UserHandle.USER_NULL} for a non-user specific icon
+ * @param userId the user id or {@code UserHandle.USER_NULL} for a non-user specific icon
*/
private static Bitmap getDefaultUserIconAsBitmap(Resources resources, int userId) {
Bitmap bitmap = null;
@@ -1124,6 +1089,7 @@
/**
* Assign the default photo to user with {@paramref userId}
+ *
* @param context used to get the {@link UserManager}
* @param userId used to get the icon bitmap
* @return true if assign photo successfully, false if failed
@@ -1160,7 +1126,8 @@
um.setUserIcon(userId, icon);
try {
avatarDataStream.close();
- } catch (IOException ioe) { }
+ } catch (IOException ioe) {
+ }
}
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -1177,9 +1144,9 @@
public void setListening(boolean listening) {
if (listening) {
UserInfo info = mContext.getSystemService(UserManager.class).getUserInfo(
- UserHandle.myUserId());
+ UserHandle.myUserId());
mSummaryLoader.setSummary(this, mContext.getString(R.string.users_summary,
- info.name));
+ info.name));
}
}
}