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

Commit 07f536a1 authored by Manish Singh's avatar Manish Singh Committed by Android (Google) Code Review
Browse files

Merge "Recategorise private space settings items" into main

parents 782ec3d5 ee3a7efa

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1396,6 +1396,10 @@ 
    <string name="private_space_gaia_education_bullet4">Suggested content related to your activity in private space apps</string>

    <!-- Text for button in private space GAIA education screen to start login [CHAR LIMIT=20] -->

    <string name="private_space_gaia_education_got_it">Got it</string>

    <!-- The title of the category for settings related to the private space lock  [CHAR LIMIT=20] -->

    <string name="private_space_category_lock">Lock</string>

    <!-- The title of the category for settings related to hiding the private space  [CHAR LIMIT=20] -->

    <string name="private_space_category_hide">Hide</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>

























res/xml/private_space_settings.xml



+12
−7




























Original line number
Diff line number
Diff line








@@ -34,7 +34,14 @@













        settings:searchable="false" />































    <PreferenceCategory













        android:title="@string/security_header">













        android:title="@string/private_space_category_lock">



























        <Preference













            android:key="private_space_use_one_lock"













            android:title="@string/private_space_lock_title"













            android:fragment="com.android.settings.privatespace.onelock.UseOneLockSettingsFragment"













            settings:controller="com.android.settings.privatespace.onelock.UseOneLockController"













            settings:searchable="false" />































        <Preference















            android:key="private_space_auto_lock"









@@ -43,12 +50,10 @@













            settings:controller="com.android.settings.privatespace.autolock.AutoLockPreferenceController"















            settings:searchable="false" />





























        <Preference













            android:key="private_space_use_one_lock"













            android:title="@string/private_space_lock_title"













            android:fragment="com.android.settings.privatespace.onelock.UseOneLockSettingsFragment"













            settings:controller="com.android.settings.privatespace.onelock.UseOneLockController"













            settings:searchable="false" />













    </PreferenceCategory>



























    <PreferenceCategory













        android:title="@string/private_space_category_hide">































        <Preference















            android:key="private_space_hidden"