This broke a bunch of people due to some style name mismatches.

This reverts commit 174917b0eae33cf51af7fab947c49738028ed018.

Change-Id: I3a07b5dbee5bd2bf7237cff6fb84dd724114f10d

6 files changed, 12 insertions, 63 deletions

diff --git a/res/drawable/chip_autocomplete_divider_background.xml b/res/drawable/chip_autocomplete_divider_background.xml
deleted file mode 100644
index c013b57..0000000
--- a/res/drawable/chip_autocomplete_divider_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="90"
-        android:startColor="@android:color/transparent"
-        android:endColor="@color/autocomplete_bottom_shadow_start" />
-</shape>
\ No newline at end of file
diff --git a/res/layout/chips_autocomplete_permission_dropdown_item.xml b/res/layout/chips_autocomplete_permission_dropdown_item.xml
deleted file mode 100644
index 6f5b54e..0000000
--- a/res/layout/chips_autocomplete_permission_dropdown_item.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014 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.
--->
-
-<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:orientation="vertical">
-
-    <View
-        android:id="@+id/chip_autocomplete_top_divider"
-        style="@style/ChipAutocompleteDividerStyle.Top" />
-
-    <LinearLayout
-        android:id="@+id/chip_permission_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/ChipAutocompleteWrapperStyle">
-
-        <TextView style="@style/ChipPermissionStyle" />
-
-        <ImageView style="@style/ChipPermissionDismissIconStyle"/>
-
-    </LinearLayout>
-
-    <View
-        android:id="@+id/chip_autocomplete_bottom_divider"
-        style="@style/ChipAutocompleteDividerStyle.Bottom.PermissionItem" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chips_autocomplete_recipient_dropdown_item.xml b/res/layout/chips_autocomplete_recipient_dropdown_item.xml
index f6d8d6f..ac30f77 100644
--- a/res/layout/chips_autocomplete_recipient_dropdown_item.xml
+++ b/res/layout/chips_autocomplete_recipient_dropdown_item.xml
@@ -43,6 +43,18 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/chip_permission_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/ChipAutocompleteWrapperStyle">
+
+        <TextView style="@style/ChipPermissionStyle" />
+
+        <ImageView style="@style/ChipPermissionDismissIconStyle"/>
+
+    </LinearLayout>
+
     <View
         android:id="@+id/chip_autocomplete_bottom_divider"
         style="@style/ChipAutocompleteDividerStyle" />
diff --git a/res/values-v17/styles.xml b/res/values-v17/styles.xml
index 360ed94..81dbbbf 100644
--- a/res/values-v17/styles.xml
+++ b/res/values-v17/styles.xml
@@ -28,12 +28,6 @@
         <item name="android:layout_marginStart">@dimen/chip_wrapper_start_padding</item>
     </style>
 
-    <style name="ChipAutocompleteDividerStyle.Bottom.PermissionItem">
-        <item name="android:background">@drawable/chip_autocomplete_divider_background</item>
-        <item name="android:layout_height">3dp</item>
-        <item name="android:layout_marginStart">0dp</item>
-    </style>
-
     <style name="ChipStartIconStyle" parent="@style/ChipIconBaseStyle">
         <item name="android:layout_marginEnd">@dimen/chip_icon_margin_end</item>
     </style>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1f32b60..79bf4f8 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,7 +21,6 @@
     <color name="chips_dropdown_background_pressed">#ededed</color>
 
     <color name="autocomplete_divider_color">#cccccc</color>
-    <color name="autocomplete_bottom_shadow_start">#40000000</color>
 
     <color name="chip_background">#f6f6f6</color>
     <color name="chip_background_invalid">#db4437</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 169d8ec..e60fb79 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -44,12 +44,6 @@
         <item name="android:layout_marginLeft">@dimen/chip_wrapper_start_padding</item>
     </style>
 
-    <style name="ChipAutocompleteDividerStyle.Bottom.PermissionItem">
-        <item name="android:background">@drawable/chip_autocomplete_divider_background</item>
-        <item name="android:layout_height">3dp</item>
-        <item name="android:layout_marginLeft">0dp</item>
-    </style>
-
     <style name="ChipTextViewLayoutStyle">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>