From d61b4a418ca25dbd0e795788c673dd4da83c47fd Mon Sep 17 00:00:00 2001 From: josephpv Date: Thu, 8 Feb 2024 19:09:56 +0000 Subject: [PATCH] Fix for PS setup crash in AOSP build Recording link : b/312454851#comment2 Bug: 312454851 Test: Manual Change-Id: I2c8f812f0bb75b1d4b41565e8545e83c0a01af09 --- .../settings/privatespace/PrivateProfileCreationError.java | 4 +--- .../settings/privatespace/PrivateSpaceAccountLoginError.java | 4 +--- .../android/settings/privatespace/PrivateSpaceEducation.java | 4 +--- .../settings/privatespace/PrivateSpaceSetLockFragment.java | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/privatespace/PrivateProfileCreationError.java b/src/com/android/settings/privatespace/PrivateProfileCreationError.java index bcaa1d36933..fa890d5afc7 100644 --- a/src/com/android/settings/privatespace/PrivateProfileCreationError.java +++ b/src/com/android/settings/privatespace/PrivateProfileCreationError.java @@ -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 */) { diff --git a/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java b/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java index fa901fc8ac4..48a5a7feb58 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java +++ b/src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java @@ -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 */) { diff --git a/src/com/android/settings/privatespace/PrivateSpaceEducation.java b/src/com/android/settings/privatespace/PrivateSpaceEducation.java index 7b06f5b9ded..4c99873c20d 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceEducation.java +++ b/src/com/android/settings/privatespace/PrivateSpaceEducation.java @@ -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; diff --git a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java index 8d66987a2fa..4a1e29b2452 100644 --- a/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java +++ b/src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java @@ -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 */) {