Merge "Autocomplete location in edit-event with recent locations and contacts' names/addresses." into ics-ub-calendar-burgundy

2 files changed, 57 insertions, 1 deletions

diff --git a/res/layout/edit_event_1.xml b/res/layout/edit_event_1.xml
index 48e6c7f8..be04cff5 100644
--- a/res/layout/edit_event_1.xml
+++ b/res/layout/edit_event_1.xml
@@ -89,7 +89,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="6dip"
         android:focusable="true">
-        <EditText
+        <AutoCompleteTextView
             android:id="@+id/location"
             android:singleLine="false"
             android:layout_height="wrap_content"
diff --git a/res/layout/location_dropdown_item.xml b/res/layout/location_dropdown_item.xml
new file mode 100644
index 00000000..d0fff1bf
--- /dev/null
+++ b/res/layout/location_dropdown_item.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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:minHeight="48dip"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="?android:attr/activatedBackgroundIndicator">
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="48dip"
+        android:layout_height="48dip"
+        android:layout_marginLeft="0dip"
+        android:src="@drawable/ic_contact_picture"
+        android:cropToPadding="true"
+        android:scaleType="centerCrop" />
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:layout_weight="1">
+        <TextView android:id="@+id/location_name"
+                  android:textColor="@drawable/list_item_font_primary"
+                  android:textSize="18sp"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:paddingLeft="8dip"
+                  android:singleLine="true"
+                  android:ellipsize="end" />
+        <TextView android:id="@+id/location_address"
+                  android:textColor="@drawable/list_item_font_secondary"
+                  android:textSize="14sp"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:paddingLeft="8dip"
+                  android:singleLine="true"
+                  android:ellipsize="end"
+                  android:layout_marginTop="-4dip" />
+    </LinearLayout>
+</LinearLayout>