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

Commit 0a209093 authored by jackqdyulei's avatar jackqdyulei
Browse files

Remove hardcode for textcolor in spinner item. 

Remove the "android:textcolor" because "Android:textAppearance"
will set the textcolor to "?attr/textColorPrimary".
Set adapter has same theme as spinner, so view inside adapter
can be inflatered correctly.

Bug: 32592245
Test: screenshot
Change-Id: If7a78ede0a029aa9fcd8f9b324a423d477c65ad7
parent 301fe80f

res/layout/filter_spinner_item.xml

+0 −1
Original line number Diff line number Diff line
@@ -23,5 +23,4 @@ 
    android:layout_height="wrap_content"

    android:ellipsize="marquee"

    android:textAppearance="@style/TextAppearance.Switch"

    android:textColor="@android:color/white"

    android:textAlignment="inherit"/>

src/com/android/settings/applications/ManageApplications.java

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ public class ManageApplications extends InstrumentedFragment 
        private final ArrayList<Integer> mFilterOptions = new ArrayList<>();



        public FilterSpinnerAdapter(ManageApplications manageApplications) {

            super(manageApplications.getActivity(), R.layout.filter_spinner_item);

            super(manageApplications.mFilterSpinner.getContext(), R.layout.filter_spinner_item);

            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

            mManageApplications = manageApplications;

        }

src/com/android/settings/applications/ProcessStatsBase.java

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ public abstract class ProcessStatsBase extends SettingsPreferenceFragment 
        super.onViewCreated(view, savedInstanceState);

        mSpinnerHeader = (ViewGroup) setPinnedHeaderView(R.layout.apps_filter_spinner);

        mFilterSpinner = (Spinner) mSpinnerHeader.findViewById(R.id.filter_spinner);

        mFilterAdapter = new ArrayAdapter<String>(getActivity(), R.layout.filter_spinner_item);

        mFilterAdapter = new ArrayAdapter<String>(mFilterSpinner.getContext(),

                R.layout.filter_spinner_item);

        mFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

        for (int i = 0; i < NUM_DURATIONS; i++) {

            mFilterAdapter.add(getString(sDurationLabels[i]));

src/com/android/settings/datausage/DataUsageList.java

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ public class DataUsageList extends DataUsageBase { 


        mHeader = setPinnedHeaderView(R.layout.apps_filter_spinner);

        mCycleSpinner = (Spinner) mHeader.findViewById(R.id.filter_spinner);

        mCycleAdapter = new CycleAdapter(getContext(), new CycleAdapter.SpinnerInterface() {

        mCycleAdapter = new CycleAdapter(mCycleSpinner.getContext(),

                new CycleAdapter.SpinnerInterface() {

            @Override

            public void setAdapter(CycleAdapter cycleAdapter) {

                mCycleSpinner.setAdapter(cycleAdapter);