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

Merge "Fix for PS setup crash in AOSP build" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-02-28 20:39:15 +00:00
committed by Android (Google) Code Review
parent 747d0afa21 d61b4a418c
commit 71e2c70225
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/privatespace/PrivateProfileCreationError.java
View File

@@ -60,9 +60,7 @@ public class PrivateProfileCreationError extends InstrumentedFragment {
.setText(R.string.private_space_cancel_label) .setText(R.string.private_space_cancel_label)
.setListener(onCancel()) .setListener(onCancel())
.setButtonType(FooterButton.ButtonType.CANCEL) .setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme( .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.build()); .build());
OnBackPressedCallback callback = OnBackPressedCallback callback =
new OnBackPressedCallback(true /* enabled by default */) { new OnBackPressedCallback(true /* enabled by default */) {

4
src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java
View File

@@ -60,9 +60,7 @@ public class PrivateSpaceAccountLoginError extends InstrumentedFragment {
.setText(R.string.private_space_skip_login_label) .setText(R.string.private_space_skip_login_label)
.setListener(onSkip()) .setListener(onSkip())
.setButtonType(FooterButton.ButtonType.CANCEL) .setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme( .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.build()); .build());
OnBackPressedCallback callback = OnBackPressedCallback callback =
new OnBackPressedCallback(true /* enabled by default */) { new OnBackPressedCallback(true /* enabled by default */) {

4
src/com/android/settings/privatespace/PrivateSpaceEducation.java
View File

@@ -62,9 +62,7 @@ public class PrivateSpaceEducation extends InstrumentedFragment {
.setText(R.string.private_space_cancel_label) .setText(R.string.private_space_cancel_label)
.setListener(onCancel()) .setListener(onCancel())
.setButtonType(FooterButton.ButtonType.CANCEL) .setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme( .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.build()); .build());
return rootView; return rootView;

4
src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
View File

@@ -70,9 +70,7 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment {
.setText(R.string.private_space_set_lock_label) .setText(R.string.private_space_set_lock_label)
.setListener(onClickNewLock()) .setListener(onClickNewLock())
.setButtonType(FooterButton.ButtonType.NEXT) .setButtonType(FooterButton.ButtonType.NEXT)
.setTheme( .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.build()); .build());
OnBackPressedCallback callback = OnBackPressedCallback callback =
new OnBackPressedCallback(true /* enabled by default */) { new OnBackPressedCallback(true /* enabled by default */) {