Merge "Fix Guest string was not translated in UMS.userWithName()" into tm-dev (9f54f436) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/users/UserDetailsSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -256,7 +256,7 @@ public class UserDetailsSettings extends SettingsPreferenceFragment

		mSwitchUserPref.setTitle(
		context.getString(com.android.settingslib.R.string.user_switch_to_user,
		UserSettings.getUserName(context, mUserInfo)));
		mUserInfo.name));

		if (mUserCaps.mDisallowSwitchUser) {
		mSwitchUserPref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context));

src/com/android/settings/users/UserSettings.java

+6 −19

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.settings.users;

		import android.annotation.NonNull;
		import android.app.Activity;
		import android.app.ActivityManager;
		import android.app.Dialog;
		@@ -562,11 +561,10 @@ public class UserSettings extends SettingsPreferenceFragment
		extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);
		extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);

		final Context context = getContext();
		SubSettingLauncher launcher = new SubSettingLauncher(context)
		SubSettingLauncher launcher = new SubSettingLauncher(getContext())
		.setDestination(UserDetailsSettings.class.getName())
		.setArguments(extras)
		.setTitleText(getUserName(context, userInfo))
		.setTitleText(userInfo.name)
		.setSourceMetricsCategory(getMetricsCategory());
		if (mGuestUserAutoCreated && userInfo.isGuest()) {
		launcher.setResultListener(this, REQUEST_EDIT_GUEST);
		@@ -956,8 +954,7 @@ public class UserSettings extends SettingsPreferenceFragment
		// "Resetting guest..."
		mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
		mExecutor.execute(() -> {
		UserInfo guest = mUserManager.createGuest(
		getContext(), getString(com.android.settingslib.R.string.user_guest));
		UserInfo guest = mUserManager.createGuest(getContext());
		mGuestCreationScheduled.set(false);
		if (guest == null) {
		Log.e(TAG, "Unable to automatically recreate guest user");
		@@ -996,9 +993,8 @@ public class UserSettings extends SettingsPreferenceFragment
		if (user.id == UserHandle.myUserId()) {
		pref = mMePreference;
		} else {
		final Context prefContext = getPrefContext();
		pref = new UserPreference(prefContext, null, user.id);
		pref.setTitle(getUserName(prefContext, user));
		pref = new UserPreference(getPrefContext(), null, user.id);
		pref.setTitle(user.name);
		userPreferences.add(pref);
		pref.setOnPreferenceClickListener(this);
		pref.setEnabled(canOpenUserDetails);
		@@ -1228,14 +1224,6 @@ public class UserSettings extends SettingsPreferenceFragment
		}
		}

		/** Returns the user's name, or the appropriate string in the case of a Guest. */
		public static String getUserName(Context context, @NonNull UserInfo userInfo) {
		if (userInfo.isGuest()) {
		return context.getString(R.string.user_guest);
		}
		return userInfo.name;
		}

		@Override
		public boolean onPreferenceClick(Preference pref) {
		if (pref == mMePreference) {
		@@ -1272,8 +1260,7 @@ public class UserSettings extends SettingsPreferenceFragment
		mAddGuest.setEnabled(false); // prevent multiple tap issue
		mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_USER_GUEST_ADD);
		Trace.beginSection("UserSettings.addGuest");
		UserInfo guest = mUserManager.createGuest(
		getContext(), getString(com.android.settingslib.R.string.user_guest));
		UserInfo guest = mUserManager.createGuest(getContext());
		Trace.endSection();
		if (guest == null) {
		Toast.makeText(getContext(),

tests/robotests/src/com/android/settings/users/UserSettingsTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -662,12 +662,12 @@ public class UserSettingsTest {
		public void onPreferenceClick_addGuestClicked_createGuestAndOpenDetails() {
		UserInfo createdGuest = getGuest(false);
		removeFlag(createdGuest, UserInfo.FLAG_INITIALIZED);
		doReturn(createdGuest).when(mUserManager).createGuest(mActivity, "Guest");
		doReturn(createdGuest).when(mUserManager).createGuest(mActivity);
		doReturn(mActivity).when(mFragment).getContext();

		mFragment.onPreferenceClick(mAddGuestPreference);

		verify(mUserManager).createGuest(mActivity, "Guest");
		verify(mUserManager).createGuest(mActivity);
		Intent startedIntent = shadowOf(mActivity).getNextStartedActivity();
		ShadowIntent shadowIntent = shadowOf(startedIntent);
		assertThat(shadowIntent.getIntentClass()).isEqualTo(SubSettings.class);