e0036fc8b2
It is not needed for the scrolling to work -- GlifLayout from the SUW library generates a ScrollView. Additional ScrollView causes Talkback to interpret it as a separate item and read out contents of its all children. See b/379256039. Video before: https://drive.google.com/file/d/1H3k5AxlIdgAA15PHUQ9tVq5AechziA4Z/view?usp=sharing&resourcekey=0-ozeQsQSS5jubL0pZ5FAZHA Video after: https://drive.google.com/file/d/1W_ODgQhbQS6Xf_57A4TcYeJbqMJxYF16/view?usp=sharing&resourcekey=0-zQ0_p3qlIxpBL3rB5SC4vQ In the before video, talkback is highlighting and (the green frames) and reading out the whole "How it works" section in addition to each element separately. After the fix it only highlights elements separately. Bug: 379256039 Test: Manually testesd and presubmit. Flag: EXEMPT bugfix Change-Id: Idf6772b8772c54c1907d3a12617fcd03451af41b
124 lines
5.5 KiB
XML
124 lines
5.5 KiB
XML
<!--
|
|
~ 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.
|
|
-->
|
|
|
|
<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/ps_education_screen"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:filterTouchesWhenObscured="true"
|
|
app:sucHeaderText="@string/private_space_setup_title"
|
|
app:sudDescriptionText="@string/private_space_hide_apps_summary"
|
|
android:icon="@drawable/ic_private_space_icon">
|
|
<LinearLayout
|
|
android:id="@+id/sud_layout_icon_container"
|
|
style="@style/SudContentFrame"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical">
|
|
<com.airbnb.lottie.LottieAnimationView
|
|
android:id="@+id/lottie_animation"
|
|
style="@style/SudContentIllustration"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
app:lottie_autoPlay="true"
|
|
app:lottie_loop="true"
|
|
app:lottie_rawRes="@raw/private_space_illustration"/>
|
|
<TextView
|
|
style="@style/PrivateSpaceSetupSubHeaderStyle"
|
|
android:text="@string/private_space_setup_sub_header"/>
|
|
<RelativeLayout
|
|
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
|
|
<ImageView
|
|
android:id="@+id/lockIcon"
|
|
style="@style/PrivateSpaceBulletPointIconStyle"
|
|
android:src="@drawable/counter_1_24dp" />
|
|
<TextView
|
|
style="@style/PrivateSpaceBulletPointTextFontStyle"
|
|
android:layout_toEndOf="@+id/lockIcon"
|
|
android:text="@string/private_space_separate_account_text"/>
|
|
</RelativeLayout>
|
|
<RelativeLayout
|
|
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
|
|
<ImageView
|
|
android:id="@+id/bellIcon"
|
|
style="@style/PrivateSpaceBulletPointIconStyle"
|
|
android:src="@drawable/counter_2_24dp" />
|
|
<TextView
|
|
style="@style/PrivateSpaceBulletPointTextFontStyle"
|
|
android:layout_toEndOf="@+id/bellIcon"
|
|
android:text="@string/private_space_protected_lock_text"/>
|
|
</RelativeLayout>
|
|
<RelativeLayout
|
|
style="@style/PrivateSpaceSetupBulletPointLayoutStyle"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content">
|
|
<ImageView
|
|
android:id="@+id/appsIcon"
|
|
style="@style/PrivateSpaceBulletPointIconStyle"
|
|
android:src="@drawable/counter_3_24dp" />
|
|
<TextView
|
|
style="@style/PrivateSpaceBulletPointTextFontStyle"
|
|
android:layout_toEndOf="@+id/appsIcon"
|
|
android:text="@string/private_space_install_apps_text"/>
|
|
</RelativeLayout>
|
|
<TextView
|
|
style="@style/PrivateSpaceSetupSubHeaderStyle"
|
|
android:text="@string/private_space_keep_in_mind_text"/>
|
|
<RelativeLayout
|
|
style="@style/PrivateSpaceSetupBulletPointLayoutStyle"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content">
|
|
<ImageView
|
|
android:id="@+id/eduIcon"
|
|
style="@style/PrivateSpaceBulletPointIconStyle"
|
|
android:contentDescription="@null"
|
|
android:src="@drawable/ic_private_space_edu_icon" />
|
|
<TextView
|
|
style="@style/PrivateSpaceBulletPointTextFontStyle"
|
|
android:layout_toEndOf="@+id/eduIcon"
|
|
android:text="@string/private_space_apps_stopped_text"/>
|
|
</RelativeLayout>
|
|
<Space
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="16dp"/>
|
|
<RelativeLayout
|
|
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
|
|
<ImageView
|
|
android:id="@+id/infoIcon"
|
|
style="@style/PrivateSpaceBulletPointIconStyle"
|
|
android:layout_width="18dp"
|
|
android:layout_height="18dp"
|
|
android:src="@drawable/ic_info_outline_24dp" />
|
|
<TextView
|
|
android:id="@+id/info"
|
|
style="@style/PrivateSpaceBulletPointTextFontStyle"
|
|
android:textSize = "14sp"
|
|
android:layout_toEndOf="@+id/infoIcon"
|
|
android:text="@string/private_space_apps_permission_text"/>
|
|
<TextView
|
|
android:id="@+id/learn_more"
|
|
style="@style/PrivateSpaceSetupSubHeaderStyle"
|
|
android:layout_below="@id/info"
|
|
android:layout_alignStart="@+id/info"
|
|
android:paddingTop="24dp"
|
|
android:paddingLeft="16dp"
|
|
android:text="@string/private_space_learn_more_text"/>
|
|
</RelativeLayout>
|
|
</LinearLayout>
|
|
</com.google.android.setupdesign.GlifLayout>
|