Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Center align illustration is PS setup screen for tablet" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-06-14 14:11:08 +00:00
committed by Android (Google) Code Review
parent 16f9205fb6 6780ee79dd
commit 7652089fa4
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout-sw600dp/private_space_setlock_screen.xml
View File

@@ -28,11 +28,8 @@
android:id="@+id/sud_layout_container" android:id="@+id/sud_layout_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
<Space android:gravity="center">
android:id="@+id/space1"
android:layout_width="1dp"
android:layout_height="@dimen/private_space_sud_items_margin_inbetween"/>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -40,8 +37,8 @@
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottie_animation" android:id="@+id/lottie_animation"
style="@style/SudContentIllustration" style="@style/SudContentIllustration"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" app:lottie_loop="true"
app:lottie_rawRes="@raw/private_space_use_screen_lock_illustration" app:lottie_rawRes="@raw/private_space_use_screen_lock_illustration"

11
res/layout-sw600dp/private_space_setup_success.xml
View File

@@ -28,11 +28,8 @@
android:id="@+id/sud_layout_container" android:id="@+id/sud_layout_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical"
<Space android:gravity="center">
android:id="@+id/space1"
android:layout_width="1dp"
android:layout_height="@dimen/private_space_sud_items_margin_inbetween"/>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -40,8 +37,8 @@
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottie_animation" android:id="@+id/lottie_animation"
style="@style/SudContentIllustration" style="@style/SudContentIllustration"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_loop="true" app:lottie_loop="true"
app:lottie_rawRes="@raw/private_space_illustration"/> app:lottie_rawRes="@raw/private_space_illustration"/>

3
res/values/config.xml
View File

@@ -839,7 +839,4 @@
<!-- Package name for diagnostics app. --> <!-- Package name for diagnostics app. -->
<string name="config_device_diagnostics_package_name" translatable="false">com.android.devicediagnostics</string> <string name="config_device_diagnostics_package_name" translatable="false">com.android.devicediagnostics</string>
<!-- Private space setup screen tablet line spacing-->
<dimen name="private_space_sud_items_margin_inbetween">60dp</dimen>
</resources> </resources>