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

[Expressive] Apply expressive style for Factory Reset page

Browse Source 
Bug: 397584484
Test: manual
Before: https://hsv.googleplex.com/5069334316580864
After: https://hsv.googleplex.com/5087123626524672
Flag: EXEMPT controlled within ThemeHelper from SUW lib
Change-Id: Ie9224773533bcf4f96bfa049d8f3f8e70bb90896
This commit is contained in:
Fan Wu
2025-02-27 03:55:41 +00:00
parent 11b78c6fef
commit b0e545875e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/MainClear.java
View File

@@ -81,6 +81,7 @@ import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton; import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.template.FooterButton.ButtonType; import com.google.android.setupcompat.template.FooterButton.ButtonType;
import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.GlifLayout;
import com.google.android.setupdesign.util.ThemeHelper;
import java.util.List; import java.util.List;
@@ -482,7 +483,6 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
.setText(R.string.main_clear_button_text) .setText(R.string.main_clear_button_text)
.setListener(mInitiateListener) .setListener(mInitiateListener)
.setButtonType(ButtonType.OTHER) .setButtonType(ButtonType.OTHER)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build()); .build());
if (Flags.showFactoryResetCancelButton()) { if (Flags.showFactoryResetCancelButton()) {
mixin.setSecondaryButton( mixin.setSecondaryButton(
@@ -490,8 +490,6 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
.setText(android.R.string.cancel) .setText(android.R.string.cancel)
.setListener(view -> activity.onBackPressed()) .setListener(view -> activity.onBackPressed())
.setButtonType(ButtonType.CANCEL) .setButtonType(ButtonType.CANCEL)
.setTheme(
com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build()); .build());
} }
mInitiateButton = mixin.getPrimaryButton(); mInitiateButton = mixin.getPrimaryButton();
@@ -627,6 +625,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
final Context context = getContext(); final Context context = getContext();
ThemeHelper.trySetSuwTheme(context);
final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context, final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId()); UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
final UserManager um = UserManager.get(context); final UserManager um = UserManager.get(context);