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

Merge "Remove temp GAIA education screen from PS setup code" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-06-07 02:47:30 +00:00
committed by Android (Google) Code Review
parent 96a1e43d98 d27f97393d
commit 4885f1833c
10 changed files with 86 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
res/layout/private_space_gaia_education_screen.xml
View File

@@ -1,111 +0,0 @@
<!--
~ 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"
android:id="@+id/ps_account_intro_screen"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:contentDescription="@null"
android:src="@drawable/ic_security_privacy_alert_primary"/>
<TextView
style="@style/PrivateSpaceSetupTextFontStyle"
android:fontFamily="google-sans"
android:text="@string/private_space_gaia_education_title"
android:layout_margin="24dp"
android:layout_marginTop="40dp"
android:gravity="center"
android:textSize="28sp"/>
<TextView
style="@style/PrivateSpaceSetupTextFontStyle"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginBottom="40dp"
android:textSize="14sp"
android:text="@string/private_space_gaia_education_description"/>
<TextView
style="@style/PrivateSpaceSetupTextFontStyle"
android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:layout_marginBottom="16dp"
android:textSize="14sp"
android:text="@string/private_space_gaia_education_header"/>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<ImageView
android:id="@+id/point1"
style="@style/PrivateSpaceBulletPointIconStyle"
android:contentDescription="@null"
android:src="@drawable/ic_text_dot" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/point1"
android:textSize="14sp"
android:text="@string/private_space_gaia_education_bullet1"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/point2"
style="@style/PrivateSpaceBulletPointIconStyle"
android:contentDescription="@null"
android:src="@drawable/ic_text_dot" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/point2"
android:textSize="14sp"
android:text="@string/private_space_gaia_education_bullet2"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/point3"
style="@style/PrivateSpaceBulletPointIconStyle"
android:contentDescription="@null"
android:src="@drawable/ic_text_dot" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/point3"
android:textSize="14sp"
android:text="@string/private_space_gaia_education_bullet3"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/point4"
style="@style/PrivateSpaceBulletPointIconStyle"
android:contentDescription="@null"
android:src="@drawable/ic_text_dot" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/point4"
android:textSize="14sp"
android:text="@string/private_space_gaia_education_bullet4"/>
</RelativeLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

4
res/layout/private_space_pre_finish_delay.xml → res/layout/private_space_wait_screen.xml
View File

@@ -25,5 +25,5 @@
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>
app:sucHeaderText="@string/private_space_wait_screen_title">
</com.google.android.setupdesign.GlifLoadingLayout>