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

Commit 01f77d8e authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Android (Google) Code Review
Browse files

Merge "Introduce guest user metrics" into sc-dev

parents 1908c535 10adda88

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

+3 −0
Original line number Diff line number Diff line
@@ -290,6 +290,9 @@ public class UserDetailsSettings extends SettingsPreferenceFragment 
    @VisibleForTesting

    void switchUser() {

        try {

            if (mUserInfo.isGuest()) {

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

            }

            ActivityManager.getService().switchUser(mUserInfo.id);

        } catch (RemoteException re) {

            Log.e(TAG, "Error while switching to other user.");

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

+3 −0
Original line number Diff line number Diff line
@@ -820,6 +820,8 @@ public class UserSettings extends SettingsPreferenceFragment 
     */

    private void exitGuest() {

        // Just to be safe

        mMetricsFeatureProvider.action(getActivity(),

                SettingsEnums.ACTION_USER_GUEST_EXIT_CONFIRMED);

        if (!isCurrentUserGuest()) {

            return;

        }
@@ -1077,6 +1079,7 @@ public class UserSettings extends SettingsPreferenceFragment 
            return true;

        } else if (pref == mAddGuest) {

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

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

            UserInfo guest = mUserManager.createGuest(

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

            openUserDetails(guest, true);