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

Commit d562080b authored by josephpv's avatar josephpv
Browse files

Update string and button choice in PS lock setup screen 

Screenshot : go/ss/93jhuNKsPPzDvzy.png
Recording link : b/334013507#comment5

Bug: 334013507
Test: Manual
Change-Id: I03e1e5297c69f1d5154a45481f54d4207f454bd4
parent c55cd952

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -1339,9 +1339,9 @@ 
    <!-- Label for button to retry creating private space again on creation error. [CHAR LIMIT=30] -->

    <string name="private_space_tryagain_label">Try Again</string>

    <!-- Title for private space lock setup screen. [CHAR LIMIT=90] -->

    <string name="private_space_lockscreen_title">Use screen lock to unlock private space?</string>

    <string name="private_space_lockscreen_title">Choose a new lock for private space?</string>

    <!-- Summary for the private space lock setup screen. [CHAR LIMIT=NONE] -->

    <string name="private_space_lockscreen_summary">You can unlock your private space the same way you unlock your device, or choose a different lock</string>

    <string name="private_space_lockscreen_summary">You can set a new lock just for private space, or use the same lock you use to unlock your device</string>

    <!-- Action label to use existing device lock for private space. [CHAR LIMIT=50] -->

    <string name="private_space_use_screenlock_label">Use screen lock</string>

    <!-- Label for private space lock setup button to choose a new lock. [CHAR LIMIT=50] -->

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

+5 −5
Original line number Diff line number Diff line
@@ -63,16 +63,16 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment { 
        final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);

        mixin.setPrimaryButton(

                new FooterButton.Builder(getContext())

                        .setText(R.string.private_space_use_screenlock_label)

                        .setListener(onClickUse())

                        .setText(R.string.private_space_set_lock_label)

                        .setListener(onClickNewLock())

                        .setButtonType(FooterButton.ButtonType.NEXT)

                        .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)

                        .build());

        mixin.setSecondaryButton(

                new FooterButton.Builder(getContext())

                        .setText(R.string.private_space_set_lock_label)

                        .setListener(onClickNewLock())

                        .setButtonType(FooterButton.ButtonType.NEXT)

                        .setText(R.string.private_space_use_screenlock_label)

                        .setListener(onClickUse())

                        .setButtonType(FooterButton.ButtonType.SKIP)

                        .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)

                        .build());

        OnBackPressedCallback callback =