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

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

Merge "[Expressive design] apply new style to SpellCheckerPreference" into main

parents 68d4f76f 7b13f149

res/layout/preference_widget_gear.xml

+1 −4
Original line number Diff line number Diff line
@@ -21,10 +21,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"

    android:paddingStart="24dp"

    android:paddingEnd="24dp"

    android:background="?android:attr/selectableItemBackground"

    android:scaleType="center"

    android:scaleType="centerInside"

    android:src="@drawable/ic_settings_accent"

    android:contentDescription="@string/settings_button" />

src/com/android/settings/inputmethod/SpellCheckerPreference.java

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.preference.PreferenceViewHolder; 


import com.android.settings.CustomListPreference;

import com.android.settings.R;

import com.android.settingslib.widget.SettingsThemeHelper;



/**

 * Spell checker service preference.
@@ -48,8 +49,9 @@ class SpellCheckerPreference extends CustomListPreference { 
    public SpellCheckerPreference(final Context context, final SpellCheckerInfo[] scis) {

        super(context, null);

        mScis = scis;

        setLayoutResource(

                com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target);

        setLayoutResource(SettingsThemeHelper.isExpressiveTheme(context)

                ? com.android.settingslib.widget.preference.twotarget.R.layout.settingslib_expressive_preference_two_target

                : com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target);



        setWidgetLayoutResource(R.layout.preference_widget_gear);

        if (scis == null) {