diff options
-rw-r--r-- | chips/res/drawable/list_item_background.xml | 21 | ||||
-rw-r--r-- | chips/res/layout/chips_recipient_dropdown_item.xml | 2 | ||||
-rw-r--r-- | chips/res/values-sw600dp/styles.xml | 2 | ||||
-rw-r--r-- | chips/res/values/attrs.xml | 1 | ||||
-rw-r--r-- | chips/res/values/colors.xml | 21 |
5 files changed, 2 insertions, 45 deletions
diff --git a/chips/res/drawable/list_item_background.xml b/chips/res/drawable/list_item_background.xml deleted file mode 100644 index 77e9393..0000000 --- a/chips/res/drawable/list_item_background.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_activated="true" android:drawable="@color/list_item_selected" /> - <item android:state_checked="true" android:drawable="@color/list_item_selected" /> - <item android:state_selected="true" android:drawable="@color/list_item_selected" /> -</selector>
\ No newline at end of file diff --git a/chips/res/layout/chips_recipient_dropdown_item.xml b/chips/res/layout/chips_recipient_dropdown_item.xml index 04bd31c..3f0497e 100644 --- a/chips/res/layout/chips_recipient_dropdown_item.xml +++ b/chips/res/layout/chips_recipient_dropdown_item.xml @@ -21,7 +21,7 @@ android:minHeight="48dip" android:orientation="horizontal" android:gravity="center_vertical" - android:background="@drawable/list_item_background"> + android:background="?android:attr/activatedBackgroundIndicator"> <LinearLayout android:layout_width="0dip" android:layout_height="wrap_content" diff --git a/chips/res/values-sw600dp/styles.xml b/chips/res/values-sw600dp/styles.xml index 8576487..912c368 100644 --- a/chips/res/values-sw600dp/styles.xml +++ b/chips/res/values-sw600dp/styles.xml @@ -14,7 +14,7 @@ limitations under the License. --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <style name="RecipientEditTextView" parent="@android:style/Widget.AutoCompleteTextView"> + <style name="RecipientEditTextView" parent="@android:attr/autoCompleteTextViewStyle"> <item name="android:paddingLeft">8dip</item> <item name="android:paddingRight">4dip</item> <item name="android:inputType">textEmailAddress|textMultiLine</item> diff --git a/chips/res/values/attrs.xml b/chips/res/values/attrs.xml index ebf6936..6a09b69 100644 --- a/chips/res/values/attrs.xml +++ b/chips/res/values/attrs.xml @@ -19,7 +19,6 @@ <add-resource type="dimen" name="chip_height" /> <add-resource type="dimen" name="chip_text_size" /> <add-resource type="color" name="default_chip_background" /> - <add-resource type="color" name="list_item_selected" /> <add-resource type="color" name="chip_selected" /> <add-resource type="string" name="more_string" /> <add-resource type="string" name="chips_waiting_for_directory_result" /> diff --git a/chips/res/values/colors.xml b/chips/res/values/colors.xml deleted file mode 100644 index d47e882..0000000 --- a/chips/res/values/colors.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <color name="default_chip_background">#77CCCCCC</color> - <color name="list_item_selected">#0099cc</color> - <color name="chip_selected">#0099cc</color> -</resources>
\ No newline at end of file |