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

Merge "Update string and button choice in PS lock setup screen" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-04-12 16:33:05 +00:00
committed by Android (Google) Code Review
parent 4868dbe243 d562080b75
commit 1759f174fb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1339,9 +1339,9 @@
<!-- Label for button to retry creating private space again on creation error. [CHAR LIMIT=30] --> <!-- Label for button to retry creating private space again on creation error. [CHAR LIMIT=30] -->
<string name="private_space_tryagain_label">Try Again</string> <string name="private_space_tryagain_label">Try Again</string>
<!-- Title for private space lock setup screen. [CHAR LIMIT=90] --> <!-- 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] --> <!-- 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] --> <!-- Action label to use existing device lock for private space. [CHAR LIMIT=50] -->
<string name="private_space_use_screenlock_label">Use screen lock</string> <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] --> <!-- Label for private space lock setup button to choose a new lock. [CHAR LIMIT=50] -->

10
src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
View File

@@ -63,16 +63,16 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment {
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class); final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton( mixin.setPrimaryButton(
new FooterButton.Builder(getContext()) new FooterButton.Builder(getContext())
.setText(R.string.private_space_use_screenlock_label) .setText(R.string.private_space_set_lock_label)
.setListener(onClickUse()) .setListener(onClickNewLock())
.setButtonType(FooterButton.ButtonType.NEXT) .setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary) .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build()); .build());
mixin.setSecondaryButton( mixin.setSecondaryButton(
new FooterButton.Builder(getContext()) new FooterButton.Builder(getContext())
.setText(R.string.private_space_set_lock_label) .setText(R.string.private_space_use_screenlock_label)
.setListener(onClickNewLock()) .setListener(onClickUse())
.setButtonType(FooterButton.ButtonType.NEXT) .setButtonType(FooterButton.ButtonType.SKIP)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary) .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
.build()); .build());
OnBackPressedCallback callback = OnBackPressedCallback callback =