Loading res/drawable/ic_error_red.xml 0 → 100644 +26 −0 Original line number Diff line number Diff line <!-- ~ Copyright (C) 2023 The Android Open Source Project ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?android:attr/colorError"> <path android:fillColor="@android:color/white" android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/> </vector> res/navigation/privatespace_private_context_nav.xml→res/layout/privatespace_account_login_error.xml +12 −8 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (C) 2023 The Android Open Source Project ~ Loading @@ -14,11 +15,14 @@ ~ limitations under the License. --> <navigation xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.setupdesign.GlifLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/private_space_navigation" app:startDestination="@id/ps_profile_lock_fragment"> <fragment android:id="@+id/ps_profile_lock_fragment" android:name="com.android.settings.privatespace.PrivateSpaceSetLockFragment" android:label="fragment_ps_lock"/> </navigation> android:id="@+id/ps_error_page_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:filterTouchesWhenObscured="true" app:sucHeaderText="@string/privatespace_retry_signin_title" app:sudDescriptionText="@string/privatespace_retry_summary" android:icon="@drawable/ic_error_red"> </com.google.android.setupdesign.GlifLayout> res/navigation/privatespace_main_context_nav.xml +17 −3 Original line number Diff line number Diff line Loading @@ -33,8 +33,8 @@ android:id="@+id/action_advance_profile_error" app:destination="@id/ps_profile_error_fragment"/> <action android:id="@+id/action_advance_to_success" app:destination="@id/ps_profile_success_fragment"/> android:id="@+id/action_advance_login_error" app:destination="@id/ps_account_error_fragment"/> </fragment> <fragment android:id="@+id/ps_profile_error_fragment" android:name="com.android.settings.privatespace.PrivateProfileCreationError" Loading @@ -46,4 +46,18 @@ <fragment android:id="@+id/ps_profile_success_fragment" android:name="com.android.settings.privatespace.SetupSuccessFragment" android:label="fragment_ps_success"/> <fragment android:id="@+id/ps_account_error_fragment" android:name="com.android.settings.privatespace.PrivateSpaceAccountLoginError" android:label="fragment_account_error"> <action android:id="@+id/action_advance_login_error" app:destination="@id/ps_account_error_fragment"/> </fragment> <fragment android:id="@+id/ps_profile_lock_fragment" android:name="com.android.settings.privatespace.PrivateSpaceSetLockFragment" android:label="fragment_ps_lock"/> <action android:id="@+id/action_success_fragment" app:destination="@id/ps_profile_success_fragment"/> <action android:id="@+id/action_set_lock_fragment" app:destination="@id/ps_profile_lock_fragment"/> </navigation> res/values/config.xml +3 −0 Original line number Diff line number Diff line Loading @@ -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> Loading res/values/strings.xml +4 −0 Original line number Diff line number Diff line Loading @@ -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> Loading Loading
res/drawable/ic_error_red.xml 0 → 100644 +26 −0 Original line number Diff line number Diff line <!-- ~ Copyright (C) 2023 The Android Open Source Project ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not use this file except in compliance with the License. ~ You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960" android:tint="?android:attr/colorError"> <path android:fillColor="@android:color/white" android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM440,520L520,520L520,280L440,280L440,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/> </vector>
res/navigation/privatespace_private_context_nav.xml→res/layout/privatespace_account_login_error.xml +12 −8 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (C) 2023 The Android Open Source Project ~ Loading @@ -14,11 +15,14 @@ ~ limitations under the License. --> <navigation xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.setupdesign.GlifLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/private_space_navigation" app:startDestination="@id/ps_profile_lock_fragment"> <fragment android:id="@+id/ps_profile_lock_fragment" android:name="com.android.settings.privatespace.PrivateSpaceSetLockFragment" android:label="fragment_ps_lock"/> </navigation> android:id="@+id/ps_error_page_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:filterTouchesWhenObscured="true" app:sucHeaderText="@string/privatespace_retry_signin_title" app:sudDescriptionText="@string/privatespace_retry_summary" android:icon="@drawable/ic_error_red"> </com.google.android.setupdesign.GlifLayout>
res/navigation/privatespace_main_context_nav.xml +17 −3 Original line number Diff line number Diff line Loading @@ -33,8 +33,8 @@ android:id="@+id/action_advance_profile_error" app:destination="@id/ps_profile_error_fragment"/> <action android:id="@+id/action_advance_to_success" app:destination="@id/ps_profile_success_fragment"/> android:id="@+id/action_advance_login_error" app:destination="@id/ps_account_error_fragment"/> </fragment> <fragment android:id="@+id/ps_profile_error_fragment" android:name="com.android.settings.privatespace.PrivateProfileCreationError" Loading @@ -46,4 +46,18 @@ <fragment android:id="@+id/ps_profile_success_fragment" android:name="com.android.settings.privatespace.SetupSuccessFragment" android:label="fragment_ps_success"/> <fragment android:id="@+id/ps_account_error_fragment" android:name="com.android.settings.privatespace.PrivateSpaceAccountLoginError" android:label="fragment_account_error"> <action android:id="@+id/action_advance_login_error" app:destination="@id/ps_account_error_fragment"/> </fragment> <fragment android:id="@+id/ps_profile_lock_fragment" android:name="com.android.settings.privatespace.PrivateSpaceSetLockFragment" android:label="fragment_ps_lock"/> <action android:id="@+id/action_success_fragment" app:destination="@id/ps_profile_success_fragment"/> <action android:id="@+id/action_set_lock_fragment" app:destination="@id/ps_profile_lock_fragment"/> </navigation>
res/values/config.xml +3 −0 Original line number Diff line number Diff line Loading @@ -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> Loading
res/values/strings.xml +4 −0 Original line number Diff line number Diff line Loading @@ -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> Loading