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

Merge "Adds Google account login during private space setup" into main

Browse Source
This commit is contained in:
Joseph Vincent
2023-11-03 18:24:50 +00:00
committed by Android (Google) Code Review
parent 2be6218c64 380ac9a48e
commit 57ca9c9c68
18 changed files with 335 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -753,6 +753,9 @@
<!-- Whether to display Cloned Apps page in Settings (Settings > Apps > Cloned Apps).-->
<bool name="config_cloned_apps_page_enabled">false</bool>
<!-- Whether to initiate Account login during Private Space setup.-->
<bool name="config_privatespace_account_login_enabled">false</bool>
<!-- Certificates of apps which are allowed to use activity embedding with Settings.-->
<string-array name="config_known_host_certs" translatable="false">
<item></item>

4
res/values/strings.xml
View File

@@ -1298,6 +1298,10 @@
<string name="privatespace_done_label">Done</string>
<!-- Toast to show on private space setup completion informing user to scroll down All apps to access private space. [CHAR LIMIT=60] -->
<string name="scrolldown_to_access">Scroll down to access Private Space</string>
<!-- 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>
<!-- 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>