Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a62d1f authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: If5a438472cd516df54212ccab5b65a01b0fa3db4
parents 8de8a32e 39ee79bd

packages/SettingsLib/IllustrationPreference/res/drawable/protection_background.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
        <shape android:shape="rectangle">

            <solid android:color="@color/settingslib_protection_color"/>

            <corners android:radius="28dp"/>

            <size android:width="@dimen/settingslib_illustration_width"

                  android:height="@dimen/settingslib_illustration_height"/>

        </shape>

    </item>

</layer-list>

packages/SettingsLib/IllustrationPreference/res/layout/illustration_preference.xml

+12 −10
Original line number Diff line number Diff line
@@ -27,27 +27,29 @@ 
    <FrameLayout

        android:id="@+id/illustration_frame"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/settingslib_illustration_height"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:gravity="center_vertical"

        android:padding="@dimen/settingslib_illustration_padding"

        android:paddingHorizontal="@dimen/settingslib_illustration_padding"

        android:orientation="vertical">



        <View

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/protection_background"/>

        <ImageView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:scaleType="centerInside"

            android:src="@drawable/protection_background"/>



        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/lottie_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:adjustViewBounds="true"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center" />



        <FrameLayout

            android:id="@+id/middleground_layout"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:background="@android:color/transparent"

            android:layout_gravity="center"

            android:visibility="gone"/>

packages/SettingsLib/IllustrationPreference/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<resources>

    <!-- 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_height">300dp</dimen>