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

Commit 7c87bdf1 authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Improve the features of IllustrationPreference." into sc-dev am: ad87e568 

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

Change-Id: I21ffca917eb7a770d0a5820a2336c8857e0b8286
parents ba104143 ad87e568

packages/SettingsLib/IllustrationPreference/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,5 +19,5 @@ android_library { 
    ],

    ],





    sdk_version: "system_current",

    sdk_version: "system_current",

    min_sdk_version: "21",

    min_sdk_version: "28",

}
 
}

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

+1 −5
Original line number Original line Diff line number Diff line
@@ -16,11 +16,7 @@ 
-->

-->





<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

    <item>

        android:top="@dimen/settingslib_illustration_padding"

        android:left="@dimen/settingslib_illustration_padding"

        android:right="@dimen/settingslib_illustration_padding"

        android:bottom="@dimen/settingslib_illustration_padding">

        <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"/>

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

+24 −5
Original line number Original line Diff line number Diff line
@@ -23,14 +23,33 @@ 
    android:gravity="center"

    android:gravity="center"

    android:orientation="horizontal">

    android:orientation="horizontal">





    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="300dp"

        android:layout_gravity="center"

        android:gravity="center_vertical"

        android:padding="@dimen/settingslib_illustration_padding"

        android:orientation="vertical">

        <com.airbnb.lottie.LottieAnimationView

        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/lottie_view"

            android:id="@+id/lottie_view"

        android:layout_width="412dp"

            android:adjustViewBounds="true"

        android:layout_height="300dp"

            android:maxWidth="412dp"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_gravity="center"

            android:layout_gravity="center"

            android:clipToOutline="true"

            android:clipToOutline="true"

            android:background="@drawable/protection_background"

            android:background="@drawable/protection_background"

            android:importantForAccessibility="no"/>

            android:importantForAccessibility="no"/>

    </LinearLayout>



    <FrameLayout

        android:id="@+id/middleground_layout"

        android:layout_width="412dp"

        android:layout_height="300dp"

        android:padding="@dimen/settingslib_illustration_padding"

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

        android:layout_gravity="center"

        android:visibility="gone"/>





    <ImageView

    <ImageView

        android:id="@+id/video_play_button"

        android:id="@+id/video_play_button"

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

+42 −0
Original line number Original line Diff line number Diff line
@@ -17,4 +17,46 @@ 




<resources>

<resources>

    <color name="settingslib_protection_color">@android:color/white</color>

    <color name="settingslib_protection_color">@android:color/white</color>



    <!-- Dynamic colors-->

    <color name="settingslib_color_blue600">#1a73e8</color>

    <color name="settingslib_color_blue400">#669df6</color>

    <color name="settingslib_color_blue300">#8ab4f8</color>

    <color name="settingslib_color_blue100">#d2e3fc</color>

    <color name="settingslib_color_blue50">#e8f0fe</color>

    <color name="settingslib_color_green600">#1e8e3e</color>

    <color name="settingslib_color_green400">#5bb974</color>

    <color name="settingslib_color_green100">#ceead6</color>

    <color name="settingslib_color_green50">#e6f4ea</color>

    <color name="settingslib_color_red600">#d93025</color>

    <color name="settingslib_color_red400">#ee675c</color>

    <color name="settingslib_color_red100">#fad2cf</color>

    <color name="settingslib_color_red50">#fce8e6</color>

    <color name="settingslib_color_yellow600">#f9ab00</color>

    <color name="settingslib_color_yellow400">#fcc934</color>

    <color name="settingslib_color_yellow100">#feefc3</color>

    <color name="settingslib_color_yellow50">#fef7e0</color>

    <color name="settingslib_color_grey900">#202124</color>

    <color name="settingslib_color_grey800">#3c4043</color>

    <color name="settingslib_color_grey700">#5f6368</color>

    <color name="settingslib_color_grey600">#80868b</color>

    <color name="settingslib_color_grey400">#bdc1c6</color>

    <color name="settingslib_color_grey300">#dadce0</color>

    <color name="settingslib_color_grey200">#e8eaed</color>

    <color name="settingslib_color_orange600">#e8710a</color>

    <color name="settingslib_color_orange400">#fa903e</color>

    <color name="settingslib_color_orange300">#fcad70</color>

    <color name="settingslib_color_orange100">#fedfc8</color>

    <color name="settingslib_color_pink600">#e52592</color>

    <color name="settingslib_color_pink400">#ff63b8</color>

    <color name="settingslib_color_pink300">#ff8bcb</color>

    <color name="settingslib_color_pink100">#fdcfe8</color>

    <color name="settingslib_color_purple600">#9334e6</color>

    <color name="settingslib_color_purple400">#af5cf7</color>

    <color name="settingslib_color_purple300">#c58af9</color>

    <color name="settingslib_color_purple100">#e9d2fd</color>

    <color name="settingslib_color_cyan600">#12b5c8</color>

    <color name="settingslib_color_cyan400">#4ecde6</color>

    <color name="settingslib_color_cyan300">#78d9ec</color>

    <color name="settingslib_color_cyan100">#cbf0f8</color>

</resources>
 
</resources>

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

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




<resources>

<resources>

    <!-- Padding of illustration -->

    <!-- Padding of illustration -->

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

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

</resources>
 
</resources>