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

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

Merge "[Expressive design] update preference background with round corner" into main

parents adf6bb84 064eb7d2

packages/SettingsLib/ActionButtonsPreference/src/com/android/settingslib/widget/ActionButtonsPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.util.List; 
 * 1. User sets invisible for button. ex: ActionButtonPreference.setButton1Visible(false)

 * 2. User doesn't set any title or icon for button.

 */

public class ActionButtonsPreference extends Preference {

public class ActionButtonsPreference extends Preference implements GroupSectionDividerMixin {



    private static final String TAG = "ActionButtonPreference";

    private static final boolean mIsAtLeastS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S;

packages/SettingsLib/BannerMessagePreference/src/com/android/settingslib/widget/BannerMessagePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import com.android.settingslib.widget.preference.banner.R; 
 * Banner message is a banner displaying important information (permission request, page error etc),

 * and provide actions for user to address. It requires a user action to be dismissed.

 */

public class BannerMessagePreference extends Preference {

public class BannerMessagePreference extends Preference implements GroupSectionDividerMixin {



    public enum AttentionLevel {

        HIGH(0, R.color.banner_background_attention_high, R.color.banner_accent_attention_high),

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class CardPreference @JvmOverloads constructor( 
    attrs: AttributeSet? = null,

    defStyleAttr: Int = 0,

    defStyleRes: Int = 0

) : Preference(context, attrs, defStyleAttr, defStyleRes) {

) : Preference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin {



    init {

        layoutResource = R.layout.settingslib_expressive_preference_card

packages/SettingsLib/IllustrationPreference/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ android_library { 
        "SettingsLibColor",

        "androidx.preference_preference",

        "lottie",

        "SettingsLibSettingsTheme",

        "settingslib_illustrationpreference_flags_lib",

    ],

packages/SettingsLib/IllustrationPreference/src/com/android/settingslib/widget/IllustrationPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import java.io.InputStream; 
/**

 * IllustrationPreference is a preference that can play lottie format animation

 */

public class IllustrationPreference extends Preference {

public class IllustrationPreference extends Preference implements GroupSectionDividerMixin {



    private static final String TAG = "IllustrationPreference";