From: jackqdyulei <jackqdyulei@google.com>
Date: Tue, 8 Nov 2016 00:23:31 +0000 (-0800)
Subject: Remove hardcode for textcolor in spinner item.
X-Git-Tag: android-x86-8.1-r1~1363^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0a209093d1ddf8175720550b08174d05ba139f72;p=android-x86%2Fpackages-apps-Settings.git

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
---

diff --git a/res/layout/filter_spinner_item.xml b/res/layout/filter_spinner_item.xml
index e83dd8071e..68f6f91c10 100644
--- a/res/layout/filter_spinner_item.xml
+++ b/res/layout/filter_spinner_item.xml
@@ -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"/>
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 2329d12f6c..5ab7248aaf 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -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;
         }
diff --git a/src/com/android/settings/applications/ProcessStatsBase.java b/src/com/android/settings/applications/ProcessStatsBase.java
index 66c0371779..6b21916627 100644
--- a/src/com/android/settings/applications/ProcessStatsBase.java
+++ b/src/com/android/settings/applications/ProcessStatsBase.java
@@ -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]));
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index abe2a9f44b..cbf5d31775 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -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);