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

Commit 71e2c702 authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

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

parents 747d0afa d61b4a41

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 */) {