moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't use AutoCompleteTextView text color workaround on API 11+ devices 

Fixes issue 4561
This commit is contained in:
cketti 2012-09-14 05:50:09 +02:00
parent 1155324df0
commit bb88ddc6a0
4 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/recipient_dropdown_item.xml
View File

@ -6,7 +6,7 @@
android:layout_centerVertical="true"
android:orientation="vertical">
<TextView android:id="@+id/text1"
android:textColor="@android:color/primary_text_light"
android:textColor="?attr/textColorPrimaryRecipientDropdown"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -16,7 +16,7 @@
android:ellipsize="end"
/>
<TextView android:id="@+id/text2"
android:textColor="@android:color/secondary_text_light"
android:textColor="?attr/textColorSecondaryRecipientDropdown"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

9
res/values-v11/themes.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- We need to override the dark theme to *not* use the workarounds of Theme.K9.Dark in
res/values/ -->
<style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
</style>
</resources>

2
res/values/attrs.xml
View File

@ -39,6 +39,8 @@
<attr name="iconMenuSearch" format="reference" />
<attr name="iconMenuSelectAll" format="reference" />
<attr name="iconMenuShowFolders" format="reference" />
<attr name="textColorPrimaryRecipientDropdown" format="reference" />
<attr name="textColorSecondaryRecipientDropdown" format="reference" />
</declare-styleable>
</resources>

20
res/values/themes.xml
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.K9.Light" parent="Theme.Sherlock.Light">
<item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
<style name="Theme.K9.Light.Base" parent="Theme.Sherlock.Light">
<item name="iconFolder">@drawable/folder_light</item>
<item name="listDivider">@drawable/divider_light</item>
<item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_light</item>
@ -40,10 +39,11 @@
<item name="iconMenuSearch">@drawable/ic_menu_search</item>
<item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
<item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
<item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
<item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
</style>
<style name="Theme.K9.Dark" parent="Theme.Sherlock">
<item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
<style name="Theme.K9.Dark.Base" parent="Theme.Sherlock">
<item name="iconFolder">@drawable/folder_dark</item>
<item name="listDivider">@drawable/divider_dark</item>
<item name="iconListItemMenu">@drawable/dropdown_ic_arrow_normal_holo_dark</item>
@ -81,6 +81,18 @@
<item name="iconMenuSearch">@drawable/ic_menu_search</item>
<item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
<item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
<item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_dark</item>
<item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_dark</item>
</style>
<style name="Theme.K9.Light" parent="Theme.K9.Light.Base">
</style>
<!-- Work around some oddities -->
<style name="Theme.K9.Dark" parent="Theme.K9.Dark.Base">
<item name="android:autoCompleteTextViewStyle">@style/Widget.K9.AutoCompleteTextView</item>
<item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
<item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
</style>
</resources>