Merge "Delaying visibility of search view to suppress soft keyboard" into honeycomb
diff --git a/res/drawable-hdpi/aizy_knob.png b/res/drawable-hdpi/aizy_knob.png
deleted file mode 100644
index 6940a94..0000000
--- a/res/drawable-hdpi/aizy_knob.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/aizy_label.9.png b/res/drawable-hdpi/aizy_label.9.png
deleted file mode 100644
index 1599037..0000000
--- a/res/drawable-hdpi/aizy_label.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/filter_selector_corner.png b/res/drawable-hdpi/filter_selector_corner.png
deleted file mode 100644
index 964dd75..0000000
--- a/res/drawable-hdpi/filter_selector_corner.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_list_picture.png b/res/drawable-hdpi/ic_contact_list_picture.png
deleted file mode 100644
index b96fbf4..0000000
--- a/res/drawable-hdpi/ic_contact_list_picture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_contact_picture.png b/res/drawable-hdpi/ic_contact_picture.png
index 7c34f5c..e29e63a 100755
--- a/res/drawable-hdpi/ic_contact_picture.png
+++ b/res/drawable-hdpi/ic_contact_picture.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_join.png b/res/drawable-hdpi/ic_join.png
deleted file mode 100644
index 8f140d4..0000000
--- a/res/drawable-hdpi/ic_join.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_cancel_holo_light.png b/res/drawable-hdpi/ic_menu_cancel_holo_light.png
deleted file mode 100644
index 259b90c..0000000
--- a/res/drawable-hdpi/ic_menu_cancel_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_item_activated_bg.9.png b/res/drawable-hdpi/list_item_activated_bg.9.png
deleted file mode 100644
index dd82c22..0000000
--- a/res/drawable-hdpi/list_item_activated_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/statusbox_widget_holo_light.9.png b/res/drawable-hdpi/statusbox_widget_holo_light.9.png
deleted file mode 100644
index 383aab8..0000000
--- a/res/drawable-hdpi/statusbox_widget_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/aizy_knob.png b/res/drawable-mdpi/aizy_knob.png
deleted file mode 100644
index daa8242..0000000
--- a/res/drawable-mdpi/aizy_knob.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/aizy_label.9.png b/res/drawable-mdpi/aizy_label.9.png
deleted file mode 100644
index 695b000..0000000
--- a/res/drawable-mdpi/aizy_label.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/filter_selector_corner.png b/res/drawable-mdpi/filter_selector_corner.png
deleted file mode 100644
index 964dd75..0000000
--- a/res/drawable-mdpi/filter_selector_corner.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_list_picture.png b/res/drawable-mdpi/ic_contact_list_picture.png
deleted file mode 100644
index f8aa4ba..0000000
--- a/res/drawable-mdpi/ic_contact_list_picture.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_contact_picture.png b/res/drawable-mdpi/ic_contact_picture.png
index 3a338e8..faa3dc0 100644
--- a/res/drawable-mdpi/ic_contact_picture.png
+++ b/res/drawable-mdpi/ic_contact_picture.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_join.png b/res/drawable-mdpi/ic_join.png
deleted file mode 100644
index 177a582..0000000
--- a/res/drawable-mdpi/ic_join.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_cancel_holo_light.png b/res/drawable-mdpi/ic_menu_cancel_holo_light.png
deleted file mode 100644
index d3bdc37..0000000
--- a/res/drawable-mdpi/ic_menu_cancel_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_item_activated_bg.9.png b/res/drawable-mdpi/list_item_activated_bg.9.png
deleted file mode 100644
index dd82c22..0000000
--- a/res/drawable-mdpi/list_item_activated_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/statusbox_widget_holo_light.9.png b/res/drawable-mdpi/statusbox_widget_holo_light.9.png
deleted file mode 100644
index 00c6ba5..0000000
--- a/res/drawable-mdpi/statusbox_widget_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/group_membership_list_item.xml b/res/layout/group_membership_list_item.xml
new file mode 100644
index 0000000..1e4f049
--- /dev/null
+++ b/res/layout/group_membership_list_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_vertical"
+ android:checkMark="?android:attr/listChoiceIndicatorMultiple"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+/>
diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index c0b3644..8845aa3 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -203,7 +203,7 @@
}
mAdapter = new ArrayAdapter<GroupSelectionItem>(
- getContext(), android.R.layout.simple_list_item_multiple_choice);
+ getContext(), R.layout.group_membership_list_item);
mGroupMetaData.moveToPosition(-1);
while (mGroupMetaData.moveToNext()) {
diff --git a/src/com/android/contacts/list/ContactEntryListFragment.java b/src/com/android/contacts/list/ContactEntryListFragment.java
index 763c094..e3f5e1c 100644
--- a/src/com/android/contacts/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/list/ContactEntryListFragment.java
@@ -760,7 +760,7 @@
protected void configurePhotoLoader() {
if (isPhotoLoaderEnabled() && mContext != null) {
if (mPhotoLoader == null) {
- mPhotoLoader = new ContactPhotoLoader(mContext, R.drawable.ic_contact_list_picture);
+ mPhotoLoader = new ContactPhotoLoader(mContext, R.drawable.ic_contact_picture);
}
if (mListView != null) {
mListView.setOnScrollListener(this);
