From 3ff8586db8d1dffef1e92a234c815a97ef70c8f9 Mon Sep 17 00:00:00 2001 From: Kedar Chitnis Date: Thu, 18 Aug 2022 05:14:26 +0000 Subject: [PATCH] Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES Bug b/214031645 has all IC reviews approved and the feature has been merged and tested for more than 3 months. Hence removing the feature flag. Bug: 214031645 Test: SettingsTest, SystemUITests Change-Id: Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6 --- ...RemoveGuestOnExitPreferenceController.java | 5 +- .../android/settings/users/UserSettings.java | 110 +++++------------- 2 files changed, 33 insertions(+), 82 deletions(-) diff --git a/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java b/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java index 182494c24cb..01df5fddc2e 100644 --- a/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java +++ b/src/com/android/settings/users/RemoveGuestOnExitPreferenceController.java @@ -24,7 +24,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserManager; import android.provider.Settings; -import android.util.FeatureFlagUtils; import android.util.Log; import androidx.appcompat.app.AlertDialog; @@ -87,9 +86,7 @@ public class RemoveGuestOnExitPreferenceController extends BasePreferenceControl || !UserManager.isGuestUserAllowEphemeralStateChange() || !mUserCaps.isAdmin() || mUserCaps.disallowAddUser() - || mUserCaps.disallowAddUserSetByAdmin() - || !FeatureFlagUtils.isEnabled(mContext, - FeatureFlagUtils.SETTINGS_GUEST_MODE_UX_CHANGES)) { + || mUserCaps.disallowAddUserSetByAdmin()) { return DISABLED_FOR_USER; } else { return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 5b2729af414..274d40a70c4 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -49,7 +49,6 @@ import android.os.UserManager; import android.provider.ContactsContract; import android.provider.Settings; import android.text.TextUtils; -import android.util.FeatureFlagUtils; import android.util.Log; import android.util.SparseArray; import android.view.Gravity; @@ -490,11 +489,6 @@ public class UserSettings extends SettingsPreferenceFragment updateUserList(); } - private boolean isEnableGuestModeUxChanges() { - return FeatureFlagUtils.isEnabled(getContext(), - FeatureFlagUtils.SETTINGS_GUEST_MODE_UX_CHANGES); - } - /** * Loads profile information for the current user. */ @@ -1362,33 +1356,25 @@ public class UserSettings extends SettingsPreferenceFragment } mGuestCategory.setVisible(true); mGuestExitPreference.setVisible(true); - if (isEnableGuestModeUxChanges()) { - mGuestResetPreference.setVisible(true); + mGuestResetPreference.setVisible(true); - boolean isGuestFirstLogin = Settings.Secure.getIntForUser( - getContext().getContentResolver(), - SETTING_GUEST_HAS_LOGGED_IN, - 0, - UserHandle.myUserId()) <= 1; - String guestExitSummary; - if (mUserCaps.mIsEphemeral) { - guestExitSummary = getContext().getString( - R.string.guest_notification_ephemeral); - } else if (isGuestFirstLogin) { - guestExitSummary = getContext().getString( - R.string.guest_notification_non_ephemeral); - } else { - guestExitSummary = getContext().getString( - R.string.guest_notification_non_ephemeral_non_first_login); - } - mGuestExitPreference.setSummary(guestExitSummary); + boolean isGuestFirstLogin = Settings.Secure.getIntForUser( + getContext().getContentResolver(), + SETTING_GUEST_HAS_LOGGED_IN, + 0, + UserHandle.myUserId()) <= 1; + String guestExitSummary; + if (mUserCaps.mIsEphemeral) { + guestExitSummary = getContext().getString( + R.string.guest_notification_ephemeral); + } else if (isGuestFirstLogin) { + guestExitSummary = getContext().getString( + R.string.guest_notification_non_ephemeral); } else { - mGuestExitPreference.setIcon(getEncircledDefaultIcon()); - mGuestExitPreference.setTitle( - mGuestUserAutoCreated - ? com.android.settingslib.R.string.guest_reset_guest - : com.android.settingslib.R.string.guest_exit_guest); + guestExitSummary = getContext().getString( + R.string.guest_notification_non_ephemeral_non_first_login); } + mGuestExitPreference.setSummary(guestExitSummary); } private void updateGuestCategory(Context context, List users) { @@ -1417,16 +1403,12 @@ public class UserSettings extends SettingsPreferenceFragment pref.setOnPreferenceClickListener(this); pref.setEnabled(canOpenUserDetails); pref.setSelectable(true); - if (isEnableGuestModeUxChanges()) { - Drawable icon = getContext().getDrawable(R.drawable.ic_account_circle_outline); - icon.setTint( - getColorAttrDefaultColor(getContext(), android.R.attr.colorControlNormal)); - pref.setIcon(encircleUserIcon( - UserIcons.convertToBitmapAtUserIconSize( - getContext().getResources(), icon))); - } else { - pref.setIcon(getEncircledDefaultIcon()); - } + Drawable icon = getContext().getDrawable(R.drawable.ic_account_circle_outline); + icon.setTint( + getColorAttrDefaultColor(getContext(), android.R.attr.colorControlNormal)); + pref.setIcon(encircleUserIcon( + UserIcons.convertToBitmapAtUserIconSize( + getContext().getResources(), icon))); pref.setKey(KEY_USER_GUEST); pref.setOrder(Preference.DEFAULT_ORDER); if (mUserCaps.mDisallowSwitchUser) { @@ -1468,13 +1450,6 @@ public class UserSettings extends SettingsPreferenceFragment && mUserCaps.mUserSwitcherEnabled) { isVisible = true; mAddGuest.setVisible(true); - // when isEnableGuestModeUxChanges() is true, the icon is set via the layout xml - // In com.android.settings.users.UserSettingsTest - // we disable the check for setIcon being called - if (!isEnableGuestModeUxChanges()) { - Drawable icon = context.getDrawable(R.drawable.ic_account_circle); - mAddGuest.setIcon(centerAndTint(icon)); - } mAddGuest.setSelectable(true); if (mGuestUserAutoCreated && mGuestCreationScheduled.get()) { mAddGuest.setTitle(com.android.internal.R.string.guest_name); @@ -1492,21 +1467,11 @@ public class UserSettings extends SettingsPreferenceFragment private void updateAddUser(Context context) { updateAddUserCommon(context, mAddUser, mUserCaps.mCanAddRestrictedProfile); - // when isEnableGuestModeUxChanges() is true, the icon is set via the layout xml - if (!isEnableGuestModeUxChanges()) { - Drawable icon = context.getDrawable(R.drawable.ic_account_circle_filled); - mAddUser.setIcon(centerAndTint(icon)); - } } private void updateAddSupervisedUser(Context context) { if (!TextUtils.isEmpty(mConfigSupervisedUserCreationPackage)) { updateAddUserCommon(context, mAddSupervisedUser, false); - // when isEnableGuestModeUxChanges() is true, the icon is set via the layout xml - if (!isEnableGuestModeUxChanges()) { - Drawable icon = context.getDrawable(R.drawable.ic_add_supervised_user); - mAddSupervisedUser.setIcon(centerAndTint(icon)); - } } else { mAddSupervisedUser.setVisible(false); } @@ -1603,28 +1568,17 @@ public class UserSettings extends SettingsPreferenceFragment @Override public boolean onPreferenceClick(Preference pref) { if (isCurrentUserGuest()) { - if (isEnableGuestModeUxChanges()) { - if (mGuestResetPreference != null && pref == mGuestResetPreference) { - showDialog(DIALOG_CONFIRM_RESET_AND_RESTART_GUEST); - return true; - } - if (mGuestExitPreference != null && pref == mGuestExitPreference) { - if (mUserCaps.mIsEphemeral) { - showDialog(DIALOG_CONFIRM_EXIT_GUEST_EPHEMERAL); - } else { - showDialog(DIALOG_CONFIRM_EXIT_GUEST_NON_EPHEMERAL); - } - return true; - } - } else { - if (mGuestExitPreference != null && pref == mGuestExitPreference) { - if (mGuestUserAutoCreated) { - showDialog(DIALOG_CONFIRM_REMOVE_GUEST_WITH_AUTO_CREATE); - } else { - showDialog(DIALOG_CONFIRM_REMOVE_GUEST); - } - return true; + if (mGuestResetPreference != null && pref == mGuestResetPreference) { + showDialog(DIALOG_CONFIRM_RESET_AND_RESTART_GUEST); + return true; + } + if (mGuestExitPreference != null && pref == mGuestExitPreference) { + if (mUserCaps.mIsEphemeral) { + showDialog(DIALOG_CONFIRM_EXIT_GUEST_EPHEMERAL); + } else { + showDialog(DIALOG_CONFIRM_EXIT_GUEST_NON_EPHEMERAL); } + return true; } } if (pref == mMePreference) {