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

Revert "Add waiting screen before PS setup completion"

Browse Source 
This reverts commit 7b0b26ec92.

Reason for revert: b/331935387. ACA has already verified the revert.

Change-Id: Idf28854f25c4bad3563408dbb7b5c84f0cdbe2f2
This commit is contained in:
Priyanka Advani
2024-03-29 21:30:27 +00:00
committed by Android (Google) Code Review
parent 7b0b26ec92
commit d2c91b587e
8 changed files with 14 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/layout/private_space_pre_finish_delay.xml
View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2024 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.
-->
<com.google.android.setupdesign.GlifLoadingLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/private_space_pre_finish"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:icon="@drawable/ic_private_space_icon"
app:sudUsePartnerHeavyTheme="true"
app:sudIllustrationType="default"
app:sucHeaderText="@string/private_space_pre_finish_title">
</com.google.android.setupdesign.GlifLoadingLayout>

13
res/navigation/privatespace_main_context_nav.xml
View File

@@ -46,13 +46,6 @@
android:id="@+id/action_retry_profile_creation"
app:destination="@id/ps_auto_advance_fragment"/>
</fragment>
<fragment android:id="@+id/ps_pre_finish_delay_fragment"
android:name="com.android.settings.privatespace.SetupPreFinishDelayFragment"
android:label="fragment_ps_pre_finish">
<action
android:id="@+id/action_success_fragment"
app:destination="@id/ps_profile_success_fragment"/>
</fragment>
<fragment android:id="@+id/ps_profile_success_fragment"
android:name="com.android.settings.privatespace.SetupSuccessFragment"
android:label="fragment_ps_success"/>
@@ -71,7 +64,7 @@
android:label="fragment_ps_lock">
<action
android:id="@+id/action_lock_success_fragment"
app:destination="@id/ps_pre_finish_delay_fragment"/>
app:destination="@id/ps_profile_success_fragment"/>
</fragment>
<fragment android:id="@+id/ps_account_intro_fragment"
android:name="com.android.settings.privatespace.PrivateSpaceGaiaEducationFragment"
@@ -83,6 +76,6 @@
android:id="@+id/action_advance_login_error"
app:destination="@id/ps_account_error_fragment"/>
</fragment>
<action android:id="@+id/action_pre_finish_delay_fragment"
app:destination="@id/ps_pre_finish_delay_fragment"/>
<action android:id="@+id/action_success_fragment"
app:destination="@id/ps_profile_success_fragment"/>
</navigation>

2
res/values/strings.xml
View File

@@ -1343,8 +1343,6 @@
<string name="private_space_use_screenlock_label">Use screen lock</string>
<!-- Label for private space lock setup button to choose a new lock. [CHAR LIMIT=50] -->
<string name="private_space_set_lock_label">Choose new lock</string>
<!-- Title for private space setup pre completion screen to add a delay. [CHAR LIMIT=30] -->
<string name="private_space_pre_finish_title">Just a sec\u2026</string>
<!-- Title for private space setup success screen. [CHAR LIMIT=30] -->
<string name="private_space_success_title">All set!</string>
<!-- Summary for the private space setup success screen. [CHAR LIMIT=NONE] -->