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

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

Merge "Interim change to upddate strings in hide page" into main

parents 01f40c28 31016b1b
Loading
Loading
Loading
Loading
+14 −1
Original line number Diff line number Diff line
@@ -1301,7 +1301,20 @@
    <!-- Title for Private Space account login error screen. [CHAR LIMIT=60] -->
    <string name="privatespace_retry_signin_title">Sign in to set up Private Space</string>
    <!-- Summary for the Private Space account login error screen. [CHAR LIMIT=NONE] -->
    <string name="privatespace_retry_summary">You need to sign in to a Account to set up Private Space</string>
    <string name="privatespace_retry_summary">You need to sign in to an account to set up Private Space</string>
    <!-- TODO(b/309950257): Remove below strings once QSTIle fulfillment is complete. -->
    <!-- Header in hide Private Space settings page to unhide Private Space. [CHAR LIMIT=60] -->
    <string name="privatespace_unhide_header">To show Private Space (Not final UX)</string>
    <!-- Text in hide Private Space settings page on how to open Private Space setting. [CHAR LIMIT=NONE] -->
    <string name="privatespace_open_settings">Open the Settings App</string>
    <!-- Text in hide Private Space settings page on how to open Private Space setting. [CHAR LIMIT=NONE] -->
    <string name="privatespace_tap_settings">Tap on Security &amp; privacy > Private Space > Hide Private Space when locked</string>
    <!-- Text in hide Private Space settings page to off hide toggle. [CHAR LIMIT=60] -->
    <string name="privatespace_turnoff_hide">Turn off \‘Hide Private Space when locked\’ toggle</string>
    <!-- Note in hide Private Space settings page to inform that this is a development feature. [CHAR LIMIT=NONE] -->
    <string name="privatespace_development_note">Note to Googlers: The development of this feature is still in progress</string>
    <!-- Text shown when "Add fingerprint" button is disabled -->
    <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>
+12 −6
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@
    <com.android.settingslib.widget.IllustrationPreference
        android:key="privatespace_hide_video"
        settings:searchable="false"
        settings:lottie_rawRes="@raw/lottie_privatespace_hide_placeholder"/>
        settings:lottie_rawRes="@drawable/privatespace_placeholder_image"/>

    <com.android.settingslib.widget.MainSwitchPreference
        android:key="hide_when_locked"
@@ -34,27 +34,33 @@
        android:selectable="false"
        settings:searchable="false" />

        <Preference
        android:key="private_space_note"
        android:summary="@string/privatespace_development_note"
        android:selectable="false"
        settings:searchable="false" />

    <PreferenceCategory
        android:title="@string/privatespace_access_header">
        android:title="@string/privatespace_unhide_header">

        <Preference
        android:key="search_when_locked_footer"
        android:icon="@drawable/counter_1_24dp"
        android:title="@string/privatespace_search_description"
        android:title="@string/privatespace_open_settings"
        android:selectable="false"
        settings:searchable="false" />

        <Preference
            android:key="tap_tile_footer"
            android:icon="@drawable/counter_2_24dp"
            android:title="@string/privatespace_tap_tile_description"
            android:title="@string/privatespace_tap_settings"
            android:selectable="false"
            settings:searchable="false" />

        <Preference
            android:key="unlock_profile_footer"
            android:key="turn_off_footer"
            android:icon="@drawable/counter_3_24dp"
            android:title="@string/privatespace_unlock_description"
            android:title="@string/privatespace_turnoff_hide"
            android:selectable="false"
            settings:searchable="false" />