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

Merge "Recategorise private space settings items" into main

Browse Source
This commit is contained in:
Manish Singh
2024-04-09 22:45:16 +00:00
committed by Android (Google) Code Review
parent 782ec3d5aa ee3a7efa31
commit 07f536a1c0
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1396,6 +1396,10 @@
<string name="private_space_gaia_education_bullet4">Suggested content related to your activity in private space apps</string> <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] --> <!-- 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> <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 --> <!-- 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> <string name="fingerprint_add_max">You can add up to <xliff:g id="count" example="5">%d</xliff:g> fingerprints</string>

19
res/xml/private_space_settings.xml
View File

@@ -34,7 +34,14 @@
settings:searchable="false" /> settings:searchable="false" />
<PreferenceCategory <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 <Preference
android:key="private_space_auto_lock" android:key="private_space_auto_lock"
@@ -43,12 +50,10 @@
settings:controller="com.android.settings.privatespace.autolock.AutoLockPreferenceController" settings:controller="com.android.settings.privatespace.autolock.AutoLockPreferenceController"
settings:searchable="false" /> settings:searchable="false" />
<Preference </PreferenceCategory>
android:key="private_space_use_one_lock"
android:title="@string/private_space_lock_title" <PreferenceCategory
android:fragment="com.android.settings.privatespace.onelock.UseOneLockSettingsFragment" android:title="@string/private_space_category_hide">
settings:controller="com.android.settings.privatespace.onelock.UseOneLockController"
settings:searchable="false" />
<Preference <Preference
android:key="private_space_hidden" android:key="private_space_hidden"