Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d61b4a41 authored by josephpv's avatar josephpv Committed by Joseph Vincent
Browse files

Fix for PS setup crash in AOSP build 

Recording link : b/312454851#comment2

Bug: 312454851
Test: Manual
Change-Id: I2c8f812f0bb75b1d4b41565e8545e83c0a01af09
parent 3454f304

src/com/android/settings/privatespace/PrivateProfileCreationError.java

+1 −3
Original line number Diff line number Diff line
@@ -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 */) {

src/com/android/settings/privatespace/PrivateSpaceAccountLoginError.java

+1 −3
Original line number Diff line number Diff line
@@ -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 */) {

src/com/android/settings/privatespace/PrivateSpaceEducation.java

+1 −3
Original line number Diff line number Diff line
@@ -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;

src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java

+1 −3
Original line number Diff line number Diff line
@@ -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 */) {