am 1c30f159: am 9c8e43d2: Merge "The mysterious blank item was just a mis-used layout" into jb-dev
* commit '1c30f159d7a5eb64c35b8a817e8153437cae32f2':
The mysterious blank item was just a mis-used layout
diff --git a/chips/res/layout/chips_waiting_for_directory_search.xml b/chips/res/layout/chips_waiting_for_directory_search.xml
index cc35c35..5ed1ec2 100644
--- a/chips/res/layout/chips_waiting_for_directory_search.xml
+++ b/chips/res/layout/chips_waiting_for_directory_search.xml
@@ -16,16 +16,26 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="50dip"
+ android:layout_height="wrap_content"
+ android:minHeight="48dip"
android:orientation="horizontal"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical">
+ <ProgressBar android:id="@+id/progress_circular"
+ style="?android:attr/progressBarStyle"
+ android:indeterminate="true"
+ android:layout_centerVertical="true"
+ android:layout_alignParentLeft="true"
+ android:layout_marginLeft="8dip"
+ android:layout_marginRight="8dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
<TextView android:id="@+id/text1"
android:textColor="?android:attr/textColorSecondary"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
+ android:layout_toRightOf="@id/progress_circular"
android:layout_centerVertical="true"
android:gravity="center_vertical"
android:paddingLeft="6dip"
@@ -33,13 +43,4 @@
android:ellipsize="end"
android:text="@string/chips_waiting_for_directory_result"
/>
- <ProgressBar android:id="@+id/progress_circular"
- style="?android:attr/progressBarStyleSmall"
- android:indeterminate="true"
- android:layout_centerVertical="true"
- android:layout_alignParentRight="true"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
</RelativeLayout>
diff --git a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
index fb6378b..a0ebd7f 100644
--- a/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
+++ b/chips/src/com/android/ex/chips/BaseRecipientAdapter.java
@@ -916,7 +916,7 @@
* Returns a layout id for a view showing "waiting for more contacts".
*/
protected int getWaitingForDirectorySearchLayout() {
- return R.layout.chips_recipient_dropdown_item;
+ return R.layout.chips_waiting_for_directory_search;
}
/**
