Update ActionBarSherlock

5 files changed, 279 insertions, 2 deletions

diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml b/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
index 019d14ef4..6a0ac9ece 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
+++ b/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml
@@ -19,7 +19,7 @@
 <com.actionbarsherlock.internal.widget.IcsLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/abs__activity_chooser_view_content"
     android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:layout_gravity="center"
     style="?attr/activityChooserViewStyle">
 
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml b/APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
index 6402f28be..ab2b0ee6c 100644
--- a/APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
+++ b/APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml
@@ -35,7 +35,7 @@ enabled.
             android:layout_height="2dip"
             android:background="@color/abs__holo_blue_light" />
     <FrameLayout
-        android:layout_width="wrap_content" android:layout_height="0dp"
+        android:layout_width="match_parent" android:layout_height="0dp"
         android:layout_weight="1"
         android:orientation="vertical"
         android:foreground="?attr/windowContentOverlay">
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml b/APG/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
new file mode 100644
index 000000000..e1d3dc49c
--- /dev/null
+++ b/APG/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:paddingLeft="@dimen/abs__dropdownitem_text_padding_left"
+                android:paddingRight="4dip"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/searchResultListItemHeight" >
+
+    <!-- Icons come first in the layout, since their placement doesn't depend on
+         the placement of the text views. -->
+    <ImageView android:id="@android:id/icon1"
+               android:layout_width="@dimen/abs__dropdownitem_icon_width"
+               android:layout_height="48dip"
+               android:scaleType="centerInside"
+               android:layout_alignParentLeft="true"
+               android:layout_alignParentTop="true"
+               android:layout_alignParentBottom="true"
+               android:visibility="invisible" />
+
+    <ImageView android:id="@+id/edit_query"
+               android:layout_width="48dip"
+               android:layout_height="48dip"
+               android:scaleType="centerInside"
+               android:layout_alignParentRight="true"
+               android:layout_alignParentTop="true"
+               android:layout_alignParentBottom="true"
+               android:src="?attr/searchViewEditQuery"
+               android:background="?attr/searchViewEditQueryBackground"
+               android:visibility="gone" />
+
+    <ImageView android:id="@android:id/icon2"
+               android:layout_width="48dip"
+               android:layout_height="48dip"
+               android:scaleType="centerInside"
+               android:layout_alignWithParentIfMissing="true"
+               android:layout_toLeftOf="@id/edit_query"
+               android:layout_alignParentTop="true"
+               android:layout_alignParentBottom="true"
+               android:visibility="gone" />
+
+
+    <!-- The subtitle comes before the title, since the height of the title depends on whether the
+         subtitle is visible or gone. -->
+    <TextView android:id="@android:id/text2"
+              style="?android:attr/dropDownItemStyle"
+              android:textAppearance="?attr/textAppearanceSearchResultSubtitle"
+              android:singleLine="true"
+              android:layout_width="match_parent"
+              android:layout_height="29dip"
+              android:paddingBottom="4dip"
+              android:gravity="top"
+              android:layout_toRightOf="@android:id/icon1"
+              android:layout_toLeftOf="@android:id/icon2"
+              android:layout_alignWithParentIfMissing="true"
+              android:layout_alignParentBottom="true"
+              android:visibility="gone" />
+
+    <!-- The title is placed above the subtitle, if there is one. If there is no
+         subtitle, it fills the parent. -->
+    <TextView android:id="@android:id/text1"
+              style="?android:attr/dropDownItemStyle"
+              android:textAppearance="?attr/textAppearanceSearchResultTitle"
+              android:singleLine="true"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_centerVertical="true"
+              android:layout_toRightOf="@android:id/icon1"
+              android:layout_toLeftOf="@android:id/icon2"
+              android:layout_above="@android:id/text2" />
+
+</RelativeLayout>
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml b/APG/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml
new file mode 100644
index 000000000..6ba319121
--- /dev/null
+++ b/APG/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2010 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:id="@+id/abs__search_bar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        >
+
+    <!-- This is actually used for the badge icon *or* the badge label (or neither) -->
+    <TextView
+            android:id="@+id/abs__search_badge"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:layout_marginBottom="2dip"
+            android:drawablePadding="0dip"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?attr/textColorPrimary"
+            android:visibility="gone"
+            />
+
+    <ImageView
+            android:id="@+id/abs__search_button"
+            style="?android:attr/actionButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:src="?attr/searchViewSearchIcon"
+            android:contentDescription="@string/abs__searchview_description_search"
+            />
+
+    <LinearLayout
+            android:id="@+id/abs__search_edit_frame"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_gravity="center_vertical"
+            android:layout_marginTop="4dip"
+            android:layout_marginBottom="4dip"
+            android:layout_marginLeft="8dip"
+            android:layout_marginRight="8dip"
+            android:orientation="horizontal">
+
+        <ImageView
+                android:id="@+id/abs__search_mag_icon"
+                android:layout_width="@dimen/abs__dropdownitem_icon_width"
+                android:layout_height="wrap_content"
+                android:scaleType="centerInside"
+                android:layout_marginLeft="@dimen/abs__dropdownitem_text_padding_left"
+                android:layout_gravity="center_vertical"
+                android:src="?attr/searchViewSearchIcon"
+                android:visibility="gone"
+                />
+
+        <!-- Inner layout contains the app icon, button(s) and EditText -->
+        <LinearLayout
+                android:id="@+id/abs__search_plate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
+                android:orientation="horizontal"
+                android:background="?attr/searchViewTextField">
+
+            <view class="com.actionbarsherlock.widget.SearchView$SearchAutoComplete"
+                  style="?attr/searchAutoCompleteTextView"
+                  android:id="@+id/abs__search_src_text"
+                  android:layout_height="36dip"
+                  android:layout_width="0dp"
+                  android:layout_weight="1"
+                  android:minWidth="@dimen/abs__search_view_text_min_width"
+                  android:layout_gravity="bottom"
+                  android:paddingLeft="@dimen/abs__dropdownitem_text_padding_left"
+                  android:paddingRight="@dimen/abs__dropdownitem_text_padding_right"
+                  android:singleLine="true"
+                  android:ellipsize="end"
+                  android:background="@null"
+                  android:inputType="text|textAutoComplete|textNoSuggestions"
+                  android:imeOptions="actionSearch"
+                  android:dropDownHeight="wrap_content"
+                  android:dropDownAnchor="@id/abs__search_edit_frame"
+                  android:dropDownVerticalOffset="0dip"
+                  android:dropDownHorizontalOffset="0dip"
+                  android:contentDescription="@string/abs__searchview_description_query"
+                  />
+
+            <ImageView
+                    android:id="@+id/abs__search_close_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingLeft="8dip"
+                    android:paddingRight="8dip"
+                    android:layout_gravity="center_vertical"
+                    android:background="?attr/selectableItemBackground"
+                    android:src="?attr/searchViewCloseIcon"
+                    android:focusable="true"
+                    android:contentDescription="@string/abs__searchview_description_clear"
+                    />
+
+        </LinearLayout>
+
+        <LinearLayout
+                android:id="@+id/abs__submit_area"
+                android:orientation="horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:background="?attr/searchViewTextFieldRight">
+
+            <ImageView
+                    android:id="@+id/abs__search_go_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
+                    android:paddingLeft="16dip"
+                    android:paddingRight="16dip"
+                    android:background="?attr/selectableItemBackground"
+                    android:src="?attr/searchViewGoIcon"
+                    android:visibility="gone"
+                    android:focusable="true"
+                    android:contentDescription="@string/abs__searchview_description_submit"
+                    />
+
+            <ImageView
+                    android:id="@+id/abs__search_voice_btn"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
+                    android:paddingLeft="16dip"
+                    android:paddingRight="16dip"
+                    android:src="?attr/searchViewVoiceIcon"
+                    android:background="?attr/selectableItemBackground"
+                    android:visibility="gone"
+                    android:focusable="true"
+                    android:contentDescription="@string/abs__searchview_description_voice"
+                    />
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml b/APG/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
new file mode 100644
index 000000000..8fc0eb12c
--- /dev/null
+++ b/APG/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/text1"
+          android:textAppearance="?android:attr/dropDownHintAppearance"
+          android:singleLine="true"
+          android:layout_marginLeft="3dip"
+          android:layout_marginTop="3dip"
+          android:layout_marginRight="3dip"
+          android:layout_marginBottom="3dip"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content" />