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

Commit 04bb540b authored by PETER LIANG's avatar PETER LIANG Committed by Automerger Merge Worker
Browse files

Merge "Replace the fixed size values with the new dimen resources." into... 

Merge "Replace the fixed size values with the new dimen resources." into sc-dev am: 0edd421d am: 6f308205

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

Change-Id: Ib6b9d3dfb84134d3ba7c996bccfe79f753878c93
parents a16fedde 6f308205

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

+4 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="300dp"

        android:layout_height="@dimen/settingslib_illustration_height"

        android:layout_gravity="center"

        android:gravity="center_vertical"

        android:padding="@dimen/settingslib_illustration_padding"
@@ -33,7 +33,7 @@ 
        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/lottie_view"

            android:adjustViewBounds="true"

            android:maxWidth="412dp"

            android:maxWidth="@dimen/settingslib_illustration_width"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="center"
@@ -44,8 +44,8 @@ 


    <FrameLayout

        android:id="@+id/middleground_layout"

        android:layout_width="412dp"

        android:layout_height="300dp"

        android:layout_width="@dimen/settingslib_illustration_width"

        android:layout_height="@dimen/settingslib_illustration_height"

        android:padding="@dimen/settingslib_illustration_padding"

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

        android:layout_gravity="center"

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

+3 −0
Original line number Diff line number Diff line
@@ -18,4 +18,7 @@ 
<resources>

    <!-- Padding of illustration -->

    <dimen name="settingslib_illustration_padding">12dp</dimen>



    <dimen name="settingslib_illustration_width">412dp</dimen>

    <dimen name="settingslib_illustration_height">300dp</dimen>

</resources>