PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove hardcode for textcolor in spinner item.

Browse Source 
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
This commit is contained in:
jackqdyulei
2016-11-07 16:23:31 -08:00
parent 301fe80fa7
commit 0a209093d1
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/filter_spinner_item.xml
View File

@@ -23,5 +23,4 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="@style/TextAppearance.Switch" android:textAppearance="@style/TextAppearance.Switch"
android:textColor="@android:color/white"
android:textAlignment="inherit"/> android:textAlignment="inherit"/>

2
src/com/android/settings/applications/ManageApplications.java
View File

@@ -646,7 +646,7 @@ public class ManageApplications extends InstrumentedFragment
private final ArrayList<Integer> mFilterOptions = new ArrayList<>(); private final ArrayList<Integer> mFilterOptions = new ArrayList<>();
public FilterSpinnerAdapter(ManageApplications manageApplications) { 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); setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
mManageApplications = manageApplications; mManageApplications = manageApplications;
} }

3
src/com/android/settings/applications/ProcessStatsBase.java
View File

@@ -103,7 +103,8 @@ public abstract class ProcessStatsBase extends SettingsPreferenceFragment
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
mSpinnerHeader = (ViewGroup) setPinnedHeaderView(R.layout.apps_filter_spinner); mSpinnerHeader = (ViewGroup) setPinnedHeaderView(R.layout.apps_filter_spinner);
mFilterSpinner = (Spinner) mSpinnerHeader.findViewById(R.id.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); mFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
for (int i = 0; i < NUM_DURATIONS; i++) { for (int i = 0; i < NUM_DURATIONS; i++) {
mFilterAdapter.add(getString(sDurationLabels[i])); mFilterAdapter.add(getString(sDurationLabels[i]));

3
src/com/android/settings/datausage/DataUsageList.java
View File

@@ -147,7 +147,8 @@ public class DataUsageList extends DataUsageBase {
mHeader = setPinnedHeaderView(R.layout.apps_filter_spinner); mHeader = setPinnedHeaderView(R.layout.apps_filter_spinner);
mCycleSpinner = (Spinner) mHeader.findViewById(R.id.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 @Override
public void setAdapter(CycleAdapter cycleAdapter) { public void setAdapter(CycleAdapter cycleAdapter) {
mCycleSpinner.setAdapter(cycleAdapter); mCycleSpinner.setAdapter(cycleAdapter);