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

Merge "Scale PS space animations to display on tablet" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-06-14 07:16:43 +00:00
committed by Android (Google) Code Review
parent d73f0e3c77 f1a16e4147
commit f3b59755b4
3 changed files with 104 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
res/layout-sw600dp/private_space_setlock_screen.xml Normal file
View File

@@ -0,0 +1,51 @@
<!--
~ 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_fragment_lock"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/private_space_lockscreen_title"
app:sudDescriptionText="@string/private_space_lockscreen_summary"
android:icon="@drawable/ic_lock">
<LinearLayout
android:id="@+id/sud_layout_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Space
android:id="@+id/space1"
android:layout_width="1dp"
android:layout_height="@dimen/private_space_sud_items_margin_inbetween"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/SudContentFrame">
<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_use_screen_lock_illustration"
/>
</FrameLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

50
res/layout-sw600dp/private_space_setup_success.xml Normal file
View File

@@ -0,0 +1,50 @@
<!--
~ 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/private_space_setup_success"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/private_space_success_title"
app:sudDescriptionText="@string/private_space_access_text"
android:icon="@drawable/ic_privatespace_done">
<LinearLayout
android:id="@+id/sud_layout_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Space
android:id="@+id/space1"
android:layout_width="1dp"
android:layout_height="@dimen/private_space_sud_items_margin_inbetween"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/SudContentFrame">
<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"/>
</FrameLayout>
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>

3
res/values/config.xml
View File

@@ -839,4 +839,7 @@
<!-- 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>