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

Commit 8e5c79a0 authored by Nigel Tao's avatar Nigel Tao Committed by Android (Google) Code Review
Browse files

Merge "[Settingslib] Fix expressvie typo" into main

parents 3ac08d27 fd92c1c8

packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressvie_spinner_dropdown_view.xml→packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressive_spinner_dropdown_view.xml

+0 −0

File moved.

View file

packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressvie_spinner_view.xml→packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressive_spinner_view.xml

+0 −0

File moved.

View file

packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressvie_spinner_view_outlined.xml→packages/SettingsLib/SettingsSpinner/res/layout-v36/settings_expressive_spinner_view_outlined.xml

+0 −0

File moved.

View file

packages/SettingsLib/SettingsSpinner/src/com/android/settingslib/widget/SettingsSpinnerAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> { 
    private static final int DEFAULT_RESOURCE = R.layout.settings_spinner_view;

    private static final int DEFAULT_DROPDOWN_RESOURCE = R.layout.settings_spinner_dropdown_view;

    private static final int DEFAULT_EXPRESSIVE_RESOURCE =

            R.layout.settings_expressvie_spinner_view;

            R.layout.settings_expressive_spinner_view;

    private static final int DEFAULT_EXPRESSIVE_DROPDOWN_RESOURCE =

            R.layout.settings_expressvie_spinner_dropdown_view;

            R.layout.settings_expressive_spinner_dropdown_view;

    private final LayoutInflater mDefaultInflater;

    private int mSelectedPosition = -1;
@@ -104,7 +104,7 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> { 
                return R.layout.settings_expressive_spinner_view_full;

            }

            case OUTLINED -> {

                return R.layout.settings_expressvie_spinner_view_outlined;

                return R.layout.settings_expressive_spinner_view_outlined;

            }

            case LARGE_OUTLINED -> {

                return R.layout.settings_expressive_spinner_view_large_outlined;