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

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

Merge "[Expressive design] Update padding for some widgets" into main

parents 7afabd4c d8fefee2

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

+11 −4
Original line number Diff line number Diff line
@@ -30,21 +30,28 @@ public class AppPreference extends Preference { 


    public AppPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    public AppPreference(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    public AppPreference(Context context) {

        super(context);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    public AppPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    private void init(Context context) {

        int resId = SettingsThemeHelper.isExpressiveTheme(context)

                ? com.android.settingslib.widget.theme.R.layout.settingslib_expressive_preference

                : R.layout.preference_app;

        setLayoutResource(resId);

    }

}

packages/SettingsLib/AppPreference/src/com/android/settingslib/widget/AppSwitchPreference.java

+11 −4
Original line number Diff line number Diff line
@@ -32,22 +32,29 @@ public class AppSwitchPreference extends SwitchPreferenceCompat { 
    public AppSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr,

            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    public AppSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {

        super(context, attrs, defStyleAttr);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    public AppSwitchPreference(Context context, AttributeSet attrs) {

        super(context, attrs);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    public AppSwitchPreference(Context context) {

        super(context);

        setLayoutResource(R.layout.preference_app);

        init(context);

    }



    private void init(Context context) {

        int resId = SettingsThemeHelper.isExpressiveTheme(context)

                ? com.android.settingslib.widget.theme.R.layout.settingslib_expressive_preference

                : R.layout.preference_app;

        setLayoutResource(resId);

    }



    @Override

packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference_icon_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:minWidth="@dimen/settingslib_expressive_space_medium3"

    android:minHeight="@dimen/settingslib_expressive_space_medium3"

    android:gravity="center"

    android:layout_marginEnd="-8dp"

    android:layout_marginEnd="-4dp"

    android:filterTouchesWhenObscured="false">



    <androidx.preference.internal.PreferenceImageView

packages/SettingsLib/SettingsTheme/res/values-v35/styles_preference_expressive.xml

+7 −6
Original line number Diff line number Diff line
@@ -36,33 +36,34 @@ 
    <style name="SettingsLibPreference.SwitchPreference" parent="SettingsSwitchPreference.SettingsLib"/>



    <style name="SettingsLibPreference.Expressive">

        <item name="android:layout">@layout/settingslib_expressive_preference</item>

        <item name="layout">@layout/settingslib_expressive_preference</item>

    </style>



    <style name="SettingsLibPreference.Category.Expressive">

    </style>



    <style name="SettingsLibPreference.CheckBoxPreference.Expressive">

        <item name="android:layout">@layout/settingslib_expressive_preference</item>

        <item name="layout">@layout/settingslib_expressive_preference</item>

    </style>



    <style name="SettingsLibPreference.SwitchPreferenceCompat.Expressive">

        <item name="android:layout">@layout/settingslib_expressive_preference</item>

        <item name="layout">@layout/settingslib_expressive_preference</item>

        <item name="android:widgetLayout">@layout/settingslib_expressive_preference_switch</item>

    </style>



    <style name="SettingsLibPreference.SeekBarPreference.Expressive"/>



    <style name="SettingsLibPreference.PreferenceScreen.Expressive">

        <item name="android:layout">@layout/settingslib_expressive_preference</item>

        <item name="layout">@layout/settingslib_expressive_preference</item>

    </style>



    <style name="SettingsLibPreference.DialogPreference.Expressive">

        <item name="layout">@layout/settingslib_expressive_preference</item>

    </style>



    <style name="SettingsLibPreference.DialogPreference.EditTextPreference.Expressive">

        <item name="android:layout">@layout/settingslib_expressive_preference</item>

        <item name="android:dialogLayout">@layout/settingslib_preference_dialog_edittext</item>

        <item name="layout">@layout/settingslib_expressive_preference</item>

        <item name="dialogLayout">@layout/settingslib_preference_dialog_edittext</item>

    </style>



    <style name="SettingsLibPreference.DropDown.Expressive">