summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-08-20 13:06:02 -0700
committerBrian Attwell <brianattwell@google.com>2014-08-20 13:16:52 -0700
commit763006167fd6906d18728adc82c81aa51d8d581a (patch)
tree7420c8f6eae53c192f9006a9179c58595624527c
parentbfa9442453c1d86e11e56702f9b8ef0e8e0da0b1 (diff)
downloadandroid_packages_apps_Contacts-763006167fd6906d18728adc82c81aa51d8d581a.tar.gz
android_packages_apps_Contacts-763006167fd6906d18728adc82c81aa51d8d581a.tar.bz2
android_packages_apps_Contacts-763006167fd6906d18728adc82c81aa51d8d581a.zip
Set colorControlActivated=colorPrimary
This affects the color of all controls once activated. For example: checked checkboxes, selected radio buttons and focused EditTexts. The new activited control color doesn't look good inside the ContactSelectionActivity's SearchView. Therefore, I setup a custom theme for this view. Bug: 17139811 Change-Id: I7fe6969bbb2a6c3c0feb40e4caf45c81edf0c14d
-rw-r--r--res/layout/custom_action_bar.xml3
-rw-r--r--res/values/styles.xml8
2 files changed, 10 insertions, 1 deletions
diff --git a/res/layout/custom_action_bar.xml b/res/layout/custom_action_bar.xml
index af104fe7f..5b930ea4d 100644
--- a/res/layout/custom_action_bar.xml
+++ b/res/layout/custom_action_bar.xml
@@ -33,6 +33,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:iconifiedByDefault="false"
- android:inputType="textFilter" />
+ android:inputType="textFilter"
+ android:theme="@style/ContactPickerSearchTheme" />
</FrameLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8ff6469b7..fc2df8cfc 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -66,6 +66,7 @@
<item name="android:windowBackground">@color/background_primary</item>
<item name="android:colorPrimaryDark">@color/primary_color_dark</item>
<item name="android:colorPrimary">@color/primary_color</item>
+ <item name="android:colorControlActivated">@color/primary_color</item>
<item name="list_item_height">?android:attr/listPreferredItemHeight</item>
<item name="activated_background">@drawable/list_item_activated_background</item>
<item name="section_header_background">@drawable/list_title_holo</item>
@@ -128,6 +129,13 @@
<item name="android:displayOptions"></item>
</style>
+ <style name="ContactPickerSearchTheme" parent="@style/PeopleTheme">
+ <item name="android:textColorPrimary">@android:color/white</item>
+ <item name="android:textColorHint">?android:textColorHintInverse</item>
+ <item name="android:colorControlActivated">?android:textColorHintInverse</item>
+ <item name="android:colorControlNormal">@android:color/white</item>
+ </style>
+
<!-- Text in the action bar at the top of the screen -->
<style name="ContactsActionBarTitleText"
parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title">