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

Commit 14f04226 authored by ELIYAZ MOMIN (xWF)'s avatar ELIYAZ MOMIN (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "[Expressive design] Update dropdown item color"" into main

parents 3a06e384 4780f535

packages/SettingsLib/SettingsSpinner/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ android_library { 
    ],



    sdk_version: "system_current",

    min_sdk_version: "23",

    min_sdk_version: "21",

}

packages/SettingsLib/SettingsSpinner/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.settingslib.widget.spinner">



    <uses-sdk android:minSdkVersion="23" />

    <uses-sdk android:minSdkVersion="21" />



</manifest>

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

+0 −13
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.settingslib.widget;



import android.content.Context;

import android.content.res.ColorStateList;

import android.os.Build;

import android.view.LayoutInflater;

import android.view.View;
@@ -46,12 +45,6 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> { 
            R.layout.settings_expressive_spinner_dropdown_view;

    private final LayoutInflater mDefaultInflater;

    private int mSelectedPosition = -1;

    private static final int DEFAULT_DROPDOWN_COLOR =

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

    private static final int DEFAULT_DROPDOWN_SELECTED_COLOR =

            com.android.settingslib.widget.theme.R.color.settingslib_materialColorOnPrimaryContainer;

    private ColorStateList mDropdownColor;

    private ColorStateList mDropdownSelectedColor;



    /**

     * Constructs a new SettingsSpinnerAdapter with the given context.
@@ -65,9 +58,6 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> { 


        setDropDownViewResource(getDropdownResource(context));

        mDefaultInflater = LayoutInflater.from(context);



        mDropdownColor = context.getColorStateList(DEFAULT_DROPDOWN_COLOR);

        mDropdownSelectedColor = context.getColorStateList(DEFAULT_DROPDOWN_SELECTED_COLOR);

    }



    @Override
@@ -84,13 +74,10 @@ public class SettingsSpinnerAdapter<T> extends ArrayAdapter<T> { 
        TextView textView = view.findViewById(android.R.id.text1);

        ImageView iconView = view.findViewById(android.R.id.icon);

        if (iconView != null) {

            iconView.setImageTintList(mDropdownSelectedColor);

            iconView.setVisibility((position == mSelectedPosition) ? View.VISIBLE : View.GONE);

        }

        T item = getItem(position);

        textView.setText(item == null ? "" : item.toString());

        textView.setTextColor(

                (position == mSelectedPosition) ? mDropdownSelectedColor : mDropdownColor);

        return view;

    }