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

Merge "Update private space setup string and loading screen title" into main

Browse Source
This commit is contained in:
Joseph Vincent
2023-12-07 22:16:19 +00:00
committed by Android (Google) Code Review
parent 62702e3c47 992f6b97dd
commit e6b9290a0e
15 changed files with 103 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/privatespace_account_login_error.xml
View File

@@ -22,7 +22,7 @@
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"
app:sucHeaderText="@string/private_space_retry_signin_title"
app:sudDescriptionText="@string/private_space_retry_summary"
android:icon="@drawable/ic_error_red">
</com.google.android.setupdesign.GlifLayout>

4
res/layout/privatespace_advancing_screen.xml
View File

@@ -17,7 +17,7 @@
<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/privatesapce_autoadvance_screen"
android:id="@+id/private_space_autoadvance_screen"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_privatespace_icon">
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="@string/privatespace_setting_up_text"
android:text="@string/private_space_setting_up_text"
android:layout_marginBottom="24dp"/>
</LinearLayout>

5
res/layout/privatespace_creation_error.xml
View File

@@ -17,11 +17,10 @@
<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/privatespace_setup_error"
android:id="@+id/private_space_setup_error"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_error_screen_title"
app:sudDescriptionText="@string/privatespace_error_screen_summary"
app:sucHeaderText="@string/private_space_error_screen_title"
android:icon="@drawable/ic_warning_circle_red">
</com.google.android.setupdesign.GlifLayout>

54
res/layout/privatespace_education_screen.xml
View File

@@ -21,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_setup_title"
app:sudDescriptionText="@string/privatespace_hide_apps_summary"
app:sucHeaderText="@string/private_space_setup_title"
app:sudDescriptionText="@string/private_space_hide_apps_summary"
android:icon="@drawable/ic_privatespace_icon">
<ScrollView
android:id="@+id/main_clear_scrollview"
@@ -43,7 +43,29 @@
android:src="@drawable/privatespace_placeholder_image"/>
<TextView
style="@style/PrivateSpaceSetupSubHeaderStyle"
android:text="@string/privatespace_how_title"/>
android:text="@string/private_space_how_title"/>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/lockIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_lock_closed" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/lockIcon"
android:text="@string/private_space_protected_lock_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/bellIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_notifications" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/bellIcon"
android:text="@string/private_space_hidden_notifications_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle"
android:layout_width="fill_parent"
@@ -55,29 +77,7 @@
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/appsIcon"
android:text="@string/privatespace_access_bottom_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/lockIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_lock_closed" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/lockIcon"
android:text="@string/privatespace_protected_lock_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/bellIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_notifications" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/bellIcon"
android:text="@string/privatespace_hidden_notifications_text"/>
android:text="@string/private_space_access_bottom_text"/>
</RelativeLayout>
<Space
android:layout_width="wrap_content"
@@ -94,7 +94,7 @@
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:textSize = "14sp"
android:layout_toRightOf="@+id/infoIcon"
android:text="@string/privatespace_apps_permission_text"/>
android:text="@string/private_space_apps_permission_text"/>
</RelativeLayout>
</LinearLayout>
</ScrollView>

4
res/layout/privatespace_setlock_screen.xml
View File

@@ -21,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_lockscreen_title"
app:sudDescriptionText="@string/privatespace_lockscreen_summary"
app:sucHeaderText="@string/private_space_lockscreen_title"
app:sudDescriptionText="@string/private_space_lockscreen_summary"
android:icon="@drawable/ic_lock">
<com.google.android.setupdesign.view.FillContentLayout
style="@style/SudContentFrame"

6
res/layout/privatespace_setup_success.xml
View File

@@ -17,11 +17,11 @@
<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/privatespace_setup_success"
android:id="@+id/private_space_setup_success"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_success_title"
app:sudDescriptionText="@string/privatespace_access_text"
app:sucHeaderText="@string/private_space_success_title"
app:sudDescriptionText="@string/private_space_access_text"
android:icon="@drawable/ic_privatespace_done">
</com.google.android.setupdesign.GlifLayout>