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

Merge "Add Private space Delete settings page inside PS settings page" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-02-01 10:12:14 +00:00
committed by Android (Google) Code Review
parent 5fa73d14ab e1a2c82db3
commit 47abd1ba60
18 changed files with 826 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/layout/private_space_confirm_deletion.xml Normal file
View File

@@ -0,0 +1,30 @@
<?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_delete_confirm"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:icon="@drawable/ic_delete_accent"
app:sudUsePartnerHeavyTheme="true"
app:sudIllustrationType="default"
app:sudDescriptionText = "@string/private_space_confirm_deletion_summary"
app:sucHeaderText="@string/private_space_confirm_deletion_header">
</com.google.android.setupdesign.GlifLoadingLayout>

68
res/layout/private_space_delete.xml Normal file
View File

@@ -0,0 +1,68 @@
<?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.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/private_space_delete_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:icon="@drawable/ic_delete_accent"
app:sucHeaderText="@string/private_space_delete_header">
<ScrollView
android:id="@+id/private_space_delete_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/private_space_delete_container"
style="@style/SudContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="vertical">
<TextView
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:id="@+id/sud_layout_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/private_space_delete_summary"/>
<TextView
android:id="@+id/accounts_label"
style="@style/TextAppearance.PreferenceTitle.SettingsLib"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:text="@string/private_space_accounts"/>
<LinearLayout
android:id="@+id/accounts"
android:layout_marginTop="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<!-- Do not add any children here as they will be removed in the MainClear.java
code. A list of accounts will be inserted programmatically. -->
</LinearLayout>
</LinearLayout>
</ScrollView>
</com.google.android.setupdesign.GlifLayout>

31
res/navigation/private_space_delete_nav.xml Normal file
View File

@@ -0,0 +1,31 @@
<!--
~ 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.
-->
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/private_space_delete_nav"
app:startDestination="@id/ps_delete_fragment">
<fragment android:id="@+id/ps_delete_fragment"
android:name="com.android.settings.privatespace.delete.PrivateSpaceDeleteFragment"
android:label="fragment_ps_delete">
<action
android:id="@+id/action_authenticate_delete"
app:destination="@id/ps_delete_progress_fragment"/>
</fragment>
<fragment android:id="@+id/ps_delete_progress_fragment"
android:name="com.android.settings.privatespace.delete.PrivateSpaceDeletionProgressFragment"
android:label="fragment_ps_auto_advance"/>
</navigation>

16
res/values/strings.xml
View File

@@ -1280,8 +1280,20 @@
<string name="privatespace_hide_on_summary">On</string>
<!-- System category for the Private Space page. [CHAR LIMIT=30] -->
<string name="private_space_category_system">System</string>
<!-- Title for the preference to delete Private Space. [CHAR LIMIT=60] -->
<string name="private_space_delete_title">Delete Private Space</string>
<!-- Title for the preference to delete Private Space. [CHAR LIMIT=40] -->
<string name="private_space_delete_title">Delete private space</string>
<!-- Title for the delete private space page. [CHAR LIMIT=40] -->
<string name="private_space_delete_header">Delete private space?</string>
<!-- Description for hide Private Space settings page. [CHAR LIMIT=NONE] -->
<string name="private_space_delete_summary">Your private space will be removed from your device. All private apps and data will be deleted. You can’t undo this action.</string>
<!-- Text for the accounts added to private space that will be removed. [CHAR LIMIT=90] -->
<string name="private_space_accounts">The following accounts will be removed from your private space:</string>
<!-- Label for private space delete button [CHAR LIMIT=30] -->
<string name="private_space_delete_button_label">Delete</string>
<!-- Title for the private space delete confirmation page. [CHAR LIMIT=40] -->
<string name="private_space_confirm_deletion_header">Deleting private space\u2026</string>
<!-- Description for private space delete confirmation page that mentions it will take a few moments. [CHAR LIMIT=40] -->
<string name="private_space_confirm_deletion_summary">This will take a few moments</string>
<!-- Toast to show when the private space was deleted. [CHAR LIMIT=NONE] -->
<string name="private_space_deleted">Private Space successfully deleted</string>
<!-- Toast to show when the private space could not be deleted. [CHAR LIMIT=NONE] -->

2
res/xml/private_space_settings.xml
View File

@@ -65,7 +65,7 @@
<Preference
android:key="private_space_delete"
android:title="@string/private_space_delete_title"
settings:controller="com.android.settings.privatespace.DeletePrivateSpaceController"
settings:controller="com.android.settings.privatespace.delete.DeletePrivateSpaceController"
settings:searchable="false" />
</PreferenceCategory>