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

Commit c7209c8e authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Adjust ZeroStatePreference UI" into main

parents 3b72421c 7bbbf5a7

packages/SettingsLib/ZeroStatePreference/res/drawable/settingslib_expressive_zerostate_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
    android:viewportHeight="161">

    <path

        android:pathData="M67.2,4.43C74.79,-1.41 85.35,-1.41 92.94,4.43L112.01,19.1C113.48,20.23 115.09,21.16 116.8,21.87L139.02,31.08C147.86,34.74 153.14,43.9 151.89,53.4L148.74,77.28C148.5,79.12 148.5,80.98 148.74,82.82L151.89,106.71C153.14,116.2 147.86,125.36 139.02,129.03L116.8,138.23C115.09,138.95 113.48,139.87 112.01,141L92.94,155.67C85.35,161.51 74.79,161.51 67.2,155.67L48.13,141C46.66,139.87 45.05,138.95 43.34,138.23L21.12,129.03C12.28,125.36 7,116.2 8.25,106.71L11.4,82.82C11.64,80.98 11.64,79.12 11.4,77.28L8.25,53.4C7,43.9 12.28,34.74 21.12,31.08L43.34,21.87C45.05,21.16 46.66,20.23 48.13,19.1L67.2,4.43Z"

        android:fillColor="@color/settingslib_materialColorSurfaceContainerHigh"/>

        android:fillColor="@color/settingslib_materialColorSurfaceBright"/>

</vector>

packages/SettingsLib/ZeroStatePreference/res/layout/settingslib_expressive_preference_zerostate.xml

+13 −8
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:layout_gravity="center"

    android:gravity="center"

    android:orientation="vertical">
@@ -34,24 +36,27 @@ 


        <ImageView

            android:id="@android:id/icon"

            android:layout_width="@dimen/settingslib_expressive_space_large3"

            android:layout_height="@dimen/settingslib_expressive_space_large3"

            android:layout_width="@dimen/settingslib_expressive_space_large2"

            android:layout_height="@dimen/settingslib_expressive_space_large2"

            android:layout_gravity="center"/>



    </FrameLayout>

    <TextView

        android:id="@android:id/title"

        android:layout_width="@dimen/settingslib_expressive_zero_state_title_width"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textAppearance="?android:attr/textAppearanceListItem"

        android:layout_marginStart="@dimen/settingslib_expressive_space_medium1"

        android:layout_marginEnd="@dimen/settingslib_expressive_space_medium1"

        android:layout_marginTop="@dimen/settingslib_expressive_space_small4"/>

    <TextView

        android:id="@android:id/summary"

        android:layout_width="@dimen/settingslib_expressive_zero_state_title_width"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center"

        android:layout_marginTop="@dimen/settingslib_expressive_space_small4"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"/>

        android:layout_marginStart="@dimen/settingslib_expressive_space_medium1"

        android:layout_marginEnd="@dimen/settingslib_expressive_space_medium1"

        android:layout_marginBottom="@dimen/settingslib_expressive_space_small1"

        android:textAppearance="?android:attr/textAppearanceListItemSecondary"/>

</LinearLayout>
 
 No newline at end of file

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

+0 −1
Original line number Diff line number Diff line
@@ -16,5 +16,4 @@ 


<resources>

    <dimen name="settingslib_expressive_zero_state_background_size">160dp</dimen>

    <dimen name="settingslib_expressive_zero_state_title_width">316dp</dimen>

</resources>
 
 No newline at end of file

packages/SettingsLib/ZeroStatePreference/src/com/android/settingslib/widget/ZeroStatePreference.kt

+3 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class ZeroStatePreference @JvmOverloads constructor( 
) : Preference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin {



    private val iconTint: Int = context.getColor(

        com.android.settingslib.widget.theme.R.color.settingslib_materialColorOnSecondaryContainer

        com.android.settingslib.widget.theme.R.color.settingslib_materialColorOnSurface

    )

    private var tintedIcon: Drawable? = null
@@ -52,6 +52,8 @@ class ZeroStatePreference @JvmOverloads constructor( 
    override fun onBindViewHolder(holder: PreferenceViewHolder) {

        super.onBindViewHolder(holder)



        holder.isDividerAllowedBelow = false

        holder.isDividerAllowedAbove = false

        holder.itemView.isFocusable = false

        holder.itemView.isClickable = false