PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introduce guest user metrics" into sc-dev am: 01f77d8e00

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13935767

Change-Id: I24f8f53534dcb54a69c87d2fe795e669e9256d2f
This commit is contained in:
Peter Kalauskas
2021-03-22 20:54:07 +00:00
committed by Automerger Merge Worker
parent 1199304fde 01f77d8e00
commit f86a127e30
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/users/UserDetailsSettings.java
View File

@@ -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.");

3
src/com/android/settings/users/UserSettings.java
View File

@@ -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);