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

[ScreenLockSetup] Create separate title string

Browse Source 
Create a separate "Choose screen lock" title for setup wizard's
version of ChooseLockGeneric, with a higher CHAR LIMIT because
setup wizard's layout has more space and can avoid using
abbreviations.

Bug: 23551150
Change-Id: I93aa8c537ac97e7a1af9414a5b3ddc218c929bff
This commit is contained in:
Maurice Lam
2015-09-10 12:05:14 -07:00
parent ec037c387d
commit 7d8ebeea94
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/setup_choose_lock_generic.xml
View File

@@ -21,6 +21,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
settings:suwBackgroundTile="@drawable/setup_illustration_tile"
settings:suwHeaderText="@string/wifi_setup_wizard_title"
settings:suwHeaderText="@string/setup_lock_settings_picker_title"
settings:suwIllustrationHorizontalTile="@drawable/setup_illustration_horizontal_tile"
settings:suwIllustrationImage="@drawable/setup_illustration_lock_screen" />

3
res/values/strings.xml
View File

@@ -940,6 +940,9 @@
<!-- Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
<string name="lock_settings_picker_title">Choose screen lock</string>
<!-- Title for screen in setup wizard, prompting user to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=40] -->
<string name="setup_lock_settings_picker_title">Choose screen lock</string>
<!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
<string name="lock_settings_picker_fingerprint_message">Choose your backup screen lock method</string>

1
src/com/android/settings/SetupChooseLockGeneric.java
View File

@@ -67,7 +67,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
Bundle savedInstanceState) {
final SetupWizardListLayout layout = (SetupWizardListLayout) inflater.inflate(
R.layout.setup_choose_lock_generic, container, false);
layout.setHeaderText(getActivity().getTitle());
final NavigationBar navigationBar = layout.getNavigationBar();
navigationBar.getNextButton().setEnabled(false);