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

Fix for PS setup crash in AOSP build

Browse Source 
Recording link : b/312454851#comment2

Bug: 312454851
Test: Manual
Change-Id: I2c8f812f0bb75b1d4b41565e8545e83c0a01af09
This commit is contained in:
josephpv
2024-02-08 19:09:56 +00:00
committed by Joseph Vincent
parent 3454f304a2
commit d61b4a418c
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)
.setListener(onCancel())
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build());
OnBackPressedCallback callback =
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)
.setListener(onSkip())
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build());
OnBackPressedCallback callback =
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)
.setListener(onCancel())
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build());
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)
.setListener(onClickNewLock())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(
androidx.appcompat.R.style
.Base_TextAppearance_AppCompat_Widget_Button)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build());
OnBackPressedCallback callback =
new OnBackPressedCallback(true /* enabled by default */) {