Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fc4642a authored by Yasin Kilicdere's avatar Yasin Kilicdere
Browse files

Fix Guest string was not translated in UMS.userWithName() 

This CL reverts the changes made in ag/14282598 since the issue is
solved from the source and removes 'String name' parameter from
UM.createGuest() calls.

Bug: 185309160
Test: atest UserDetailsSettingsTest
Change-Id: I92acad938d79e21b45af99cc76ff411022b61f1b
Merged-In: I92acad938d79e21b45af99cc76ff411022b61f1b
(cherry picked from commit ae871ba8)
parent cdb08ee9

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

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




        mSwitchUserPref.setTitle(

        mSwitchUserPref.setTitle(

                context.getString(com.android.settingslib.R.string.user_switch_to_user,

                context.getString(com.android.settingslib.R.string.user_switch_to_user,

                        UserSettings.getUserName(context, mUserInfo)));

                        mUserInfo.name));





        if (mUserCaps.mDisallowSwitchUser) {

        if (mUserCaps.mDisallowSwitchUser) {

            mSwitchUserPref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context));

            mSwitchUserPref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context));

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

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




package com.android.settings.users;

package com.android.settings.users;





import android.annotation.NonNull;

import android.app.Activity;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.Dialog;

import android.app.Dialog;
@@ -562,11 +561,10 @@ public class UserSettings extends SettingsPreferenceFragment 
        extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);

        extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);

        extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);

        extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);





        final Context context = getContext();

        SubSettingLauncher launcher = new SubSettingLauncher(getContext())

        SubSettingLauncher launcher = new SubSettingLauncher(context)

                .setDestination(UserDetailsSettings.class.getName())

                .setDestination(UserDetailsSettings.class.getName())

                .setArguments(extras)

                .setArguments(extras)

                .setTitleText(getUserName(context, userInfo))

                .setTitleText(userInfo.name)

                .setSourceMetricsCategory(getMetricsCategory());

                .setSourceMetricsCategory(getMetricsCategory());

        if (mGuestUserAutoCreated && userInfo.isGuest()) {

        if (mGuestUserAutoCreated && userInfo.isGuest()) {

            launcher.setResultListener(this, REQUEST_EDIT_GUEST);

            launcher.setResultListener(this, REQUEST_EDIT_GUEST);
@@ -956,8 +954,7 @@ public class UserSettings extends SettingsPreferenceFragment 
            // "Resetting guest..."

            // "Resetting guest..."

            mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);

            mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);

            mExecutor.execute(() -> {

            mExecutor.execute(() -> {

                UserInfo guest = mUserManager.createGuest(

                UserInfo guest = mUserManager.createGuest(getContext());

                        getContext(), getString(com.android.settingslib.R.string.user_guest));

                mGuestCreationScheduled.set(false);

                mGuestCreationScheduled.set(false);

                if (guest == null) {

                if (guest == null) {

                    Log.e(TAG, "Unable to automatically recreate guest user");

                    Log.e(TAG, "Unable to automatically recreate guest user");
@@ -996,9 +993,8 @@ public class UserSettings extends SettingsPreferenceFragment 
            if (user.id == UserHandle.myUserId()) {

            if (user.id == UserHandle.myUserId()) {

                pref = mMePreference;

                pref = mMePreference;

            } else {

            } else {

                final Context prefContext = getPrefContext();

                pref = new UserPreference(getPrefContext(), null, user.id);

                pref = new UserPreference(prefContext, null, user.id);

                pref.setTitle(user.name);

                pref.setTitle(getUserName(prefContext, user));

                userPreferences.add(pref);

                userPreferences.add(pref);

                pref.setOnPreferenceClickListener(this);

                pref.setOnPreferenceClickListener(this);

                pref.setEnabled(canOpenUserDetails);

                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

    @Override

    public boolean onPreferenceClick(Preference pref) {

    public boolean onPreferenceClick(Preference pref) {

        if (pref == mMePreference) {

        if (pref == mMePreference) {
@@ -1272,8 +1260,7 @@ public class UserSettings extends SettingsPreferenceFragment 
            mAddGuest.setEnabled(false); // prevent multiple tap issue

            mAddGuest.setEnabled(false); // prevent multiple tap issue

            mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_USER_GUEST_ADD);

            mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_USER_GUEST_ADD);

            Trace.beginSection("UserSettings.addGuest");

            Trace.beginSection("UserSettings.addGuest");

            UserInfo guest = mUserManager.createGuest(

            UserInfo guest = mUserManager.createGuest(getContext());

                    getContext(), getString(com.android.settingslib.R.string.user_guest));

            Trace.endSection();

            Trace.endSection();

            if (guest == null) {

            if (guest == null) {

                Toast.makeText(getContext(),

                Toast.makeText(getContext(),

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -662,12 +662,12 @@ public class UserSettingsTest { 
    public void onPreferenceClick_addGuestClicked_createGuestAndOpenDetails() {

    public void onPreferenceClick_addGuestClicked_createGuestAndOpenDetails() {

        UserInfo createdGuest = getGuest(false);

        UserInfo createdGuest = getGuest(false);

        removeFlag(createdGuest, UserInfo.FLAG_INITIALIZED);

        removeFlag(createdGuest, UserInfo.FLAG_INITIALIZED);

        doReturn(createdGuest).when(mUserManager).createGuest(mActivity, "Guest");

        doReturn(createdGuest).when(mUserManager).createGuest(mActivity);

        doReturn(mActivity).when(mFragment).getContext();

        doReturn(mActivity).when(mFragment).getContext();





        mFragment.onPreferenceClick(mAddGuestPreference);

        mFragment.onPreferenceClick(mAddGuestPreference);





        verify(mUserManager).createGuest(mActivity, "Guest");

        verify(mUserManager).createGuest(mActivity);

        Intent startedIntent = shadowOf(mActivity).getNextStartedActivity();

        Intent startedIntent = shadowOf(mActivity).getNextStartedActivity();

        ShadowIntent shadowIntent = shadowOf(startedIntent);

        ShadowIntent shadowIntent = shadowOf(startedIntent);

        assertThat(shadowIntent.getIntentClass()).isEqualTo(SubSettings.class);

        assertThat(shadowIntent.getIntentClass()).isEqualTo(SubSettings.class);