summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-09-02 22:08:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-02 22:08:55 +0000
commit701ca2d9341f60faf7cad99856a64458e6e473c3 (patch)
tree89dae908602e10c420a92d887cca37e08fa55463
parent8a152314eb63ad6c3d26ea9b1356dc9e40b6a526 (diff)
parent0cfdd9826106f2ae640301c85e5c9628e711aadf (diff)
downloadandroid_frameworks_opt_chips-701ca2d9341f60faf7cad99856a64458e6e473c3.tar.gz
android_frameworks_opt_chips-701ca2d9341f60faf7cad99856a64458e6e473c3.tar.bz2
android_frameworks_opt_chips-701ca2d9341f60faf7cad99856a64458e6e473c3.zip
am 0cfdd982: Allow for keyboard navigation down chips list
* commit '0cfdd9826106f2ae640301c85e5c9628e711aadf': Allow for keyboard navigation down chips list
-rw-r--r--res/layout/chips_autocomplete_recipient_dropdown_item.xml2
-rw-r--r--res/values/styles.xml5
2 files changed, 3 insertions, 4 deletions
diff --git a/res/layout/chips_autocomplete_recipient_dropdown_item.xml b/res/layout/chips_autocomplete_recipient_dropdown_item.xml
index d15a97b..ec512c2 100644
--- a/res/layout/chips_autocomplete_recipient_dropdown_item.xml
+++ b/res/layout/chips_autocomplete_recipient_dropdown_item.xml
@@ -18,6 +18,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:background="?android:attr/selectableItemBackground"
android:minHeight="@dimen/chip_dropdown_height"
android:orientation="vertical">
@@ -28,7 +29,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/chips_dropdown_background"
style="@style/ChipAutocompleteWrapperStyle">
<LinearLayout style="@style/ChipTextViewLayoutStyle">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2e7d6b4..5c7dcec 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -13,15 +13,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources xmlns:tools="http://schemas.android.com/tools"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:tools="http://schemas.android.com/tools">
<style name="RecipientEditTextViewBase" parent="@android:attr/autoCompleteTextViewStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">@null</item>
<item name="android:inputType">textEmailAddress|textMultiLine</item>
<item name="android:minHeight">@dimen/chip_height</item>
- <item name="android:popupBackground">@null</item>
+ <item name="android:popupBackground">@android:color/white</item>
<item name="android:textAlignment" tools:ignore="NewApi">viewStart</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textDirection" tools:ignore="NewApi">locale</item>