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

This reverts commit 174917b0eae33cf51af7fab947c49738028ed018.

Change-Id: I3a07b5dbee5bd2bf7237cff6fb84dd724114f10d

2 files changed, 12 insertions, 44 deletions

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" />