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

Merge "Refine the IllustrationPreference." into sc-dev am: 39ee79bd8a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15151600

Change-Id: I04ec5dae821c66e54851d535ca444cae05903e53
This commit is contained in:
Stanley Wang
2021-07-02 16:36:17 +00:00
committed by Automerger Merge Worker
parent f92b764055 39ee79bd8a
commit 29203ba4e2
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml
View File

@@ -20,6 +20,8 @@
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="@color/settingslib_protection_color"/> <solid android:color="@color/settingslib_protection_color"/>
<corners android:radius="28dp"/> <corners android:radius="28dp"/>
<size android:width="@dimen/settingslib_illustration_width"
android:height="@dimen/settingslib_illustration_height"/>
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

22
packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml
View File

@@ -27,27 +27,29 @@
<FrameLayout <FrameLayout
android:id="@+id/illustration_frame" android:id="@+id/illustration_frame"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/settingslib_illustration_height" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="@dimen/settingslib_illustration_padding" android:paddingHorizontal="@dimen/settingslib_illustration_padding"
android:orientation="vertical"> android:orientation="vertical">
<View <ImageView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@drawable/protection_background"/> android:scaleType="centerInside"
android:src="@drawable/protection_background"/>
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/lottie_view" android:id="@+id/lottie_view"
android:layout_width="match_parent" android:adjustViewBounds="true"
android:layout_height="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center" />
<FrameLayout <FrameLayout
android:id="@+id/middleground_layout" android:id="@+id/middleground_layout"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone"/> android:visibility="gone"/>

2
packages/SettingsLib/IllustrationPreference/res/values/dimens.xml
View File

@@ -17,7 +17,7 @@
<resources> <resources>
<!-- Padding of illustration --> <!-- Padding of illustration -->
<dimen name="settingslib_illustration_padding">12dp</dimen> <dimen name="settingslib_illustration_padding">16dp</dimen>
<dimen name="settingslib_illustration_width">412dp</dimen> <dimen name="settingslib_illustration_width">412dp</dimen>
<dimen name="settingslib_illustration_height">300dp</dimen> <dimen name="settingslib_illustration_height">300dp</dimen>