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

Commit 6d07779c authored by Maurice Lam's avatar Maurice Lam Committed by Android (Google) Code Review
Browse files

Merge "[ScreenLockSetup] Create separate title string"

parents f2686165 7d8ebeea
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -946,6 +946,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>
+0 −1
Original line number Diff line number Diff line
@@ -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);