Replace ActionBarSherlock version 4.2.0 with 4.3.1

Change-Id: Ib385b4a6b60a0fee65af55e3c6cd590747256bc1

883 files changed, 7816 insertions, 2179 deletions

diff --git a/Android.mk b/Android.mk
index 51c982a..32daa4f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,8 +1,8 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := $(call all-java-files-under, library/src)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/library/res
+LOCAL_SRC_FILES := $(call all-java-files-under, actionbarsherlock/src)
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/actionbarsherlock/res
 LOCAL_MANIFEST_FILE := library/AndroidManifest.xml
 
 LOCAL_JAVA_LIBRARIES := \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9a52b6..63f84f4 100644..100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,59 @@
 Change Log
 ===============================================================================
 
+Version 4.3.1 *(2013-04-28)*
+----------------------------
+
+ * Fix: Importing library into Eclipse as a Maven module now works correctly.
+ * Prevent dispatching touch events to both action bar and content view on API
+   11 and up.
+ * Add Hebrew and Brazillian translations to i18n module.
+
+
+Version 4.3.0 *(2013-04-15)*
+----------------------------
+
+ * New: FEST module for testing ActionBarSherlock classes.
+ * New: i18n module for including internationalized strings used by actionbar.
+ * Removed dialog themes.
+ * Fix: `SearchView` suggestions now work properly.
+ * Fix: Prevent rare NPE when restoring state on pre-Honeycomb devices.
+ * Fix: Correct behavior of `IcsColorDrawable`'s `setAlpha` method.
+ * Fix: Handle cases where `Locale.ROOT` is not present on pre-Honeycomb.
+ * Fix: Correct tab measurement edge-case on pre-Honeycomb.
+ * Use custom Toast layout to ensure consistent look and feel.
+ * Fix: Prevent monkey runners from uselessly crashing.
+ * Fix: Do not hold on to old menu items after a call to `invalidateOptionsMenu`.
+ * Fix: Ensure `ShareActionProvider` works when only one intent is available.
+ * Fix: Scroll list navigation to the selected item when opened.
+
+
+Version 4.2.0 *(2012-10-07)*
+----------------------------
+
+**Maven `artifactId` is now 'actionbarsherlock'.**
+
+Note: The `.Dialog` themes are now deprecated. These will be removed in a future
+version of the library.
+
+ * Add `SearchView` widget for standard search interaction (API 8+ only)
+ * Fix: `ShareActionProvider` in the split action bar no longer fills the entire
+   screen.
+ * Fix: `ShareActionProvider` now does file I/O on a background thread.
+ * Fix: Automatically correct `ColorDrawable` not respecting bounds when used as
+   a stacked background.
+ * Fix: Ensure fragments collection is present before dispatching events.
+ * Fix: XML-defined `onClick` searches the correct context for the declared
+   method.
+ * Fix: Ensure action mode start/finish callbacks are invoked on the activity
+   for the native action bar.
+ * Fix: Allow tab callbacks to have a fragment transaction instance for any
+   `FragmentActivity`.
+ * Fix: Ensure `CollapsibleActionView` callbacks are dispatched in both native
+   and compatbility action bars.
+ * Fix: Remove `.ForceOverflow` themes. These never should have been included.
+
+
 Version 4.1.0 *(2012-05-17)*
 ----------------------------
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100755
index 0000000..30d3833
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,11 @@
+Contributing
+============
+
+If you would like to contribute code to ActionBarSherlock you can do so through
+GitHub by forking the repository and sending a pull request.
+
+When submitting code, please make every effort to follow existing conventions
+and style in order to keep the code as readable as possible. Please also make
+sure your code compiles by running `mvn clean verify`. Checkstyle failures
+during compilation indicate errors in your style and can be viewed in the
+`checkstyle-result.xml` file.
diff --git a/LICENSE.txt b/LICENSE.txt
index d645695..d645695 100644..100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
diff --git a/README.md b/README.md
index 4aadb8c..6506c36 100644..100755
--- a/README.md
+++ b/README.md
@@ -19,8 +19,7 @@ and up.
 Try out the sample applications on the Android Market: [Feature Demos][4],
 [Fragments][5], and [RoboGuice][6].
 
-Continuous integration is provided by a CloudBees FOSS Jenkins instance at
-[jakewharton.ci.cloudbees.com][7].
+Continuous integration is provided by [Travis CI][7].
 
 
 
@@ -58,4 +57,4 @@ License
  [4]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.demos
  [5]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.fragments
  [6]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.roboguice
- [7]: http://jakewharton.ci.cloudbees.com/job/ActionBarSherlock/
+ [7]: https://travis-ci.org/JakeWharton/ActionBarSherlock
diff --git a/RELEASING.md b/RELEASING.md
new file mode 100755
index 0000000..7fe25fa
--- /dev/null
+++ b/RELEASING.md
@@ -0,0 +1,24 @@
+ActionBarSherlock Release Process
+=================================
+
+ 1. Make sure she builds!
+
+        mvn clean verify
+
+ 2. Ensure the `CHANGELOG.md` file has up-to-date information and the current date.
+ 3. Pull in the latest translations in the i18n module.
+ 4. Change all of the sample `AndroidManifest.xml` files to the correct version and bump the
+    version code arbitrarily.
+
+        find actionbarsherlock-samples -name AndroidManifest.xml -exec sed -i '' 's|versionCode="[0-9]*"|versionCode="431"|g' {} \;
+        find actionbarsherlock-samples -name AndroidManifest.xml -exec sed -i '' 's|versionName="[0-9.]*"|versionName="4.3.1"|g' {} \;
+
+ 5. Make the release!
+
+        mvn clean release:clean
+        mvn release:prepare release:perform
+
+ 6. Promote the Maven artifact on Sonatype's OSS Nexus install.
+ 7. Deploy the latest website.
+
+        ./deploy_website.sh
diff --git a/actionbarsherlock-fest/pom.xml b/actionbarsherlock-fest/pom.xml
new file mode 100755
index 0000000..7563e98
--- /dev/null
+++ b/actionbarsherlock-fest/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>actionbarsherlock-fest</artifactId>
+  <name>ActionBarSherlock FEST Assertions</name>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>support-v4</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.actionbarsherlock</groupId>
+      <artifactId>actionbarsherlock</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup</groupId>
+      <artifactId>fest-android</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/ACTIONBARSHERLOCK.java b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/ACTIONBARSHERLOCK.java
new file mode 100755
index 0000000..912f10e
--- /dev/null
+++ b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/ACTIONBARSHERLOCK.java
@@ -0,0 +1,26 @@
+package org.fest.assertions.api;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.view.ActionMode;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import org.fest.assertions.api.com.actionbarsherlock.app.ActionBarAssert;
+import org.fest.assertions.api.com.actionbarsherlock.view.ActionModeAssert;
+import org.fest.assertions.api.com.actionbarsherlock.view.MenuAssert;
+import org.fest.assertions.api.com.actionbarsherlock.view.MenuItemAssert;
+
+/** Assertions for testing ActionBarSherlock classes. */
+public class ACTIONBARSHERLOCK {
+  public static ActionBarAssert assertThat(ActionBar actual) {
+    return new ActionBarAssert(actual);
+  }
+  public static ActionModeAssert assertThat(ActionMode actual) {
+    return new ActionModeAssert(actual);
+  }
+  public static MenuAssert assertThat(Menu actual) {
+    return new MenuAssert(actual);
+  }
+  public static MenuItemAssert assertThat(MenuItem actual) {
+    return new MenuItemAssert(actual);
+  }
+}
diff --git a/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/app/ActionBarAssert.java b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/app/ActionBarAssert.java
new file mode 100755
index 0000000..45d1a24
--- /dev/null
+++ b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/app/ActionBarAssert.java
@@ -0,0 +1,158 @@
+package org.fest.assertions.api.com.actionbarsherlock.app;
+
+import com.actionbarsherlock.app.ActionBar;
+import org.fest.assertions.api.android.Utils;
+import java.util.ArrayList;
+import java.util.List;
+import org.fest.assertions.api.AbstractAssert;
+
+import static com.actionbarsherlock.app.ActionBar.DISPLAY_HOME_AS_UP;
+import static com.actionbarsherlock.app.ActionBar.DISPLAY_SHOW_CUSTOM;
+import static com.actionbarsherlock.app.ActionBar.DISPLAY_SHOW_HOME;
+import static com.actionbarsherlock.app.ActionBar.DISPLAY_SHOW_TITLE;
+import static com.actionbarsherlock.app.ActionBar.DISPLAY_USE_LOGO;
+import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_LIST;
+import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_STANDARD;
+import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_TABS;
+import static org.fest.assertions.api.Assertions.assertThat;
+
+/** Assertions for {@link ActionBar} instances. */
+public class ActionBarAssert extends AbstractAssert<ActionBarAssert, ActionBar> {
+  public ActionBarAssert(ActionBar actual) {
+    super(actual, ActionBarAssert.class);
+  }
+
+  public ActionBarAssert hasDisplayOptions(int options) {
+    isNotNull();
+    final int actualOptions = actual.getDisplayOptions();
+    assertThat(actualOptions) //
+        .overridingErrorMessage("Expected display options <%s> but was <%s>.",
+            displayOptionsToString(options), displayOptionsToString(actualOptions)) //
+        .isEqualTo(options);
+    return this;
+  }
+
+  public ActionBarAssert hasHeight(int height) {
+    isNotNull();
+    int actualHeight = actual.getHeight();
+    assertThat(actualHeight) //
+        .overridingErrorMessage("Expected height <%s> but was <%s>.", height, actualHeight) //
+        .isEqualTo(height);
+    return this;
+  }
+
+  public ActionBarAssert hasNavigationItemCount(int count) {
+    isNotNull();
+    int actualCount = actual.getNavigationItemCount();
+    assertThat(actualCount) //
+        .overridingErrorMessage("Expected count <%s> but was <%s>.", count, actualCount) //
+        .isEqualTo(count);
+    return this;
+  }
+
+  public ActionBarAssert hasNavigationMode(int mode) {
+    isNotNull();
+    int actualMode = actual.getNavigationMode();
+    assertThat(actualMode) //
+        .overridingErrorMessage("Expected mode <%s> but was <%s>.", navigationModeToString(mode),
+            navigationModeToString(actualMode)) //
+        .isEqualTo(mode);
+    return this;
+  }
+
+  public ActionBarAssert hasSelectedNavigationIndex(int index) {
+    isNotNull();
+    int actualIndex = actual.getSelectedNavigationIndex();
+    assertThat(actualIndex) //
+        .overridingErrorMessage("Expected selected index <%s> but was <%s>.", index, actualIndex) //
+        .isEqualTo(index);
+    return this;
+  }
+
+  public ActionBarAssert hasSubtitle(CharSequence subtitle) {
+    isNotNull();
+    CharSequence actualSubtitle = actual.getSubtitle();
+    assertThat(actualSubtitle) //
+        .overridingErrorMessage("Expected subtitle <%s> but was <%s>.", subtitle, actualSubtitle) //
+        .isEqualTo(subtitle);
+    return this;
+  }
+
+  public ActionBarAssert hasSubtitle(int resId) {
+    return hasSubtitle(actual.getThemedContext().getString(resId));
+  }
+
+  public ActionBarAssert hasTabCount(int count) {
+    isNotNull();
+    int actualCount = actual.getTabCount();
+    assertThat(actualCount) //
+        .overridingErrorMessage("Expected tab count of <%s> but was <%s>.", count, actualCount) //
+        .isEqualTo(count);
+    return this;
+  }
+
+  public ActionBarAssert hasTitle(CharSequence title) {
+    isNotNull();
+    CharSequence actualTitle = actual.getTitle();
+    assertThat(actualTitle) //
+        .overridingErrorMessage("Expected title <%s> but was <%s>.", title, actualTitle) //
+        .isEqualTo(title);
+    return this;
+  }
+
+  public ActionBarAssert hasTitle(int resId) {
+    return hasTitle(actual.getThemedContext().getString(resId));
+  }
+
+  public ActionBarAssert isShowing() {
+    isNotNull();
+    assertThat(actual.isShowing()) //
+        .overridingErrorMessage("Expected to be showing but was not showing.") //
+        .isTrue();
+    return this;
+  }
+
+  public ActionBarAssert isNotShowing() {
+    isNotNull();
+    assertThat(actual.isShowing()) //
+        .overridingErrorMessage("Expected to be not showing but was showing.") //
+        .isFalse();
+    return this;
+  }
+
+  private static String navigationModeToString(int mode) {
+    switch (mode) {
+      case NAVIGATION_MODE_LIST:
+        return "list";
+      case NAVIGATION_MODE_STANDARD:
+        return "standard";
+      case NAVIGATION_MODE_TABS:
+        return "tabs";
+      default:
+        throw new IllegalArgumentException("Unknown navigation mode: " + mode);
+    }
+  }
+
+  private static String displayOptionsToString(int options) {
+    if (options == 0) {
+      return "none";
+    }
+    List<String> parts = new ArrayList<String>();
+    if ((options & DISPLAY_HOME_AS_UP) != 0) {
+      parts.add("homeAsUp");
+    }
+    if ((options & DISPLAY_SHOW_CUSTOM) != 0) {
+      parts.add("showCustom");
+    }
+    if ((options & DISPLAY_SHOW_HOME) != 0) {
+      parts.add("showHome");
+    }
+    if ((options & DISPLAY_SHOW_TITLE) != 0) {
+      parts.add("showTitle");
+    }
+    if ((options & DISPLAY_USE_LOGO) != 0) {
+      parts.add("useLogo");
+    }
+    return Utils.join(parts);
+  }
+}
diff --git a/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/ActionModeAssert.java b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/ActionModeAssert.java
new file mode 100755
index 0000000..60421ba
--- /dev/null
+++ b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/ActionModeAssert.java
@@ -0,0 +1,58 @@
+package org.fest.assertions.api.com.actionbarsherlock.view;
+
+import com.actionbarsherlock.view.ActionMode;
+import android.view.View;
+import org.fest.assertions.api.AbstractAssert;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+
+/** Assertions for {@link ActionMode} instances. */
+public class ActionModeAssert extends AbstractAssert<ActionModeAssert, ActionMode> {
+  public ActionModeAssert(ActionMode actual) {
+    super(actual, ActionModeAssert.class);
+  }
+
+  public ActionModeAssert hasCustomView() {
+    isNotNull();
+    assertThat(actual.getCustomView()) //
+        .overridingErrorMessage("Expected custom view but was not present.") //
+        .isNotNull();
+    return this;
+  }
+
+  public ActionModeAssert hasCustomView(View view) {
+    isNotNull();
+    View actualView = actual.getCustomView();
+    assertThat(actualView) //
+        .overridingErrorMessage("Expected custom view <%s> but was <%s>.", view, actualView) //
+        .isEqualTo(view);
+    return this;
+  }
+
+  public ActionModeAssert hasSubtitle(CharSequence subtitle) {
+    isNotNull();
+    CharSequence actualSubtitle = actual.getSubtitle();
+    assertThat(actualSubtitle) //
+        .overridingErrorMessage("Expected subtitle <%s> but was <%s>.", subtitle, actualSubtitle) //
+        .isEqualTo(subtitle);
+    return this;
+  }
+
+  public ActionModeAssert hasTag(Object tag) {
+    isNotNull();
+    Object actualTag = actual.getTag();
+    assertThat(actualTag) //
+        .overridingErrorMessage("Expected tag <%s> but was <%s>.", tag, actualTag) //
+        .isEqualTo(tag);
+    return this;
+  }
+
+  public ActionModeAssert hasTitle(CharSequence title) {
+    isNotNull();
+    CharSequence actualTitle = actual.getTitle();
+    assertThat(actualTitle) //
+        .overridingErrorMessage("Expected title <%s> but was <%s>.", title, actualTitle) //
+        .isEqualTo(title);
+    return this;
+  }
+}
diff --git a/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/MenuAssert.java b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/MenuAssert.java
new file mode 100755
index 0000000..d040166
--- /dev/null
+++ b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/MenuAssert.java
@@ -0,0 +1,55 @@
+package org.fest.assertions.api.com.actionbarsherlock.view;
+
+import com.actionbarsherlock.view.Menu;
+import org.fest.assertions.api.AbstractAssert;
+import org.fest.assertions.api.Assertions;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+
+/** Assertions for {@link Menu} instances. */
+public final class MenuAssert extends AbstractAssert<MenuAssert, Menu> {
+  public MenuAssert(Menu actual) {
+    super(actual, MenuAssert.class);
+  }
+
+  public MenuAssert hasItem(int id) {
+    isNotNull();
+    assertThat(actual.findItem(id)) //
+        .overridingErrorMessage("Expected menu item with ID <%s> but was not found.") //
+        .isNotNull();
+    return this;
+  }
+
+  public MenuAssert hasItemAt(int index) {
+    isNotNull();
+    assertThat(actual.getItem(index)) //
+        .overridingErrorMessage("Expected menu item at index <%s> but was not found.") //
+        .isNotNull();
+    return this;
+  }
+
+  public MenuAssert hasVisibleItems() {
+    isNotNull();
+    Assertions.assertThat(actual.hasVisibleItems()) //
+        .overridingErrorMessage("Expected to have visible items but had no visible items.") //
+        .isTrue();
+    return this;
+  }
+
+  public MenuAssert hasNoVisibleItems() {
+    isNotNull();
+    Assertions.assertThat(actual.hasVisibleItems()) //
+        .overridingErrorMessage("Expected to have no visible items but had visible items.") //
+        .isFalse();
+    return this;
+  }
+
+  public MenuAssert hasSize(int size) {
+    isNotNull();
+    int actualSize = actual.size();
+    Assertions.assertThat(actualSize) //
+        .overridingErrorMessage("Expected size <%s> but was <%s>.", size, actualSize) //
+        .isEqualTo(size);
+    return this;
+  }
+}
diff --git a/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/MenuItemAssert.java b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/MenuItemAssert.java
new file mode 100755
index 0000000..9e3103c
--- /dev/null
+++ b/actionbarsherlock-fest/src/main/java/org/fest/assertions/api/com/actionbarsherlock/view/MenuItemAssert.java
@@ -0,0 +1,205 @@
+package org.fest.assertions.api.com.actionbarsherlock.view;
+
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import com.actionbarsherlock.view.MenuItem;
+import android.view.View;
+import org.fest.assertions.api.AbstractAssert;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+
+/** Assertions for {@link MenuItem} instances. */
+public class MenuItemAssert extends AbstractAssert<MenuItemAssert, MenuItem> {
+  public MenuItemAssert(MenuItem actual) {
+    super(actual, MenuItemAssert.class);
+  }
+
+  public MenuItemAssert hasActionView(View view) {
+    isNotNull();
+    View actualView = actual.getActionView();
+    assertThat(actualView) //
+        .overridingErrorMessage("Expected action view <%s> but was <%s>.", view, actualView) //
+        .isSameAs(view);
+    return this;
+  }
+
+  public MenuItemAssert hasAlphabeticShortcut(char shortcut) {
+    isNotNull();
+    char actualShortcut = actual.getAlphabeticShortcut();
+    assertThat(actualShortcut) //
+        .overridingErrorMessage("Expected alphabetic shortcut <%s> but was <%s>.", shortcut,
+            actualShortcut) //
+        .isEqualTo(shortcut);
+    return this;
+  }
+
+  public MenuItemAssert hasGroupId(int id) {
+    isNotNull();
+    int actualId = actual.getGroupId();
+    assertThat(actualId) //
+        .overridingErrorMessage("Expected group ID <%s> but was <%s>.", id, actualId) //
+        .isEqualTo(id);
+    return this;
+  }
+
+  public MenuItemAssert hasIcon(Drawable icon) {
+    isNotNull();
+    Drawable actualIcon = actual.getIcon();
+    assertThat(actualIcon) //
+        .overridingErrorMessage("Expected icon <%s> but was <%s>.", icon, actualIcon) //
+        .isSameAs(icon);
+    return this;
+  }
+
+  public MenuItemAssert hasIntent(Intent intent) {
+    isNotNull();
+    Intent actualIntent = actual.getIntent();
+    assertThat(actualIntent) //
+        .overridingErrorMessage("Expected intent <%s> but was <%s>.", intent, actualIntent) //
+        .isEqualTo(intent);
+    return this;
+  }
+
+  public MenuItemAssert hasItemId(int id) {
+    isNotNull();
+    int actualId = actual.getItemId();
+    assertThat(actualId) //
+        .overridingErrorMessage("Expected item ID <%s> but was <%s>.", id, actualId) //
+        .isEqualTo(id);
+    return this;
+  }
+
+  public MenuItemAssert hasNumericShortcut(char shortcut) {
+    isNotNull();
+    char actualShortcut = actual.getNumericShortcut();
+    assertThat(actualShortcut) //
+        .overridingErrorMessage("Expected numeric shortcut <%s> but was <%s>.", shortcut,
+            actualShortcut) //
+        .isEqualTo(shortcut);
+    return this;
+  }
+
+  public MenuItemAssert hasOrder(int order) {
+    isNotNull();
+    int actualOrder = actual.getOrder();
+    assertThat(actualOrder) //
+        .overridingErrorMessage("Expected order <%s> but was <%s>.", order, actualOrder) //
+        .isEqualTo(order);
+    return this;
+  }
+
+  public MenuItemAssert hasTitle(CharSequence title) {
+    isNotNull();
+    CharSequence actualTitle = actual.getTitle();
+    assertThat(actualTitle) //
+        .overridingErrorMessage("Expected title <%s> but was <%s>.", title, actualTitle) //
+        .isEqualTo(title);
+    return this;
+  }
+
+  public MenuItemAssert hasCondensedTitle(CharSequence title) {
+    isNotNull();
+    CharSequence actualTitle = actual.getTitleCondensed();
+    assertThat(actualTitle) //
+        .overridingErrorMessage("Expected condensed title <%s> but was <%s>.", title,
+            actualTitle) //
+        .isEqualTo(title);
+    return this;
+  }
+
+  public MenuItemAssert hasSubMenu() {
+    isNotNull();
+    assertThat(actual.hasSubMenu()) //
+        .overridingErrorMessage("Expected to have sub-menu but sub-menu was not present.") //
+        .isTrue();
+    return this;
+  }
+
+  public MenuItemAssert hasNoSubMenu() {
+    isNotNull();
+    assertThat(actual.hasSubMenu()) //
+        .overridingErrorMessage("Expected to not have a sub-menu but sub-menu was present.") //
+        .isFalse();
+    return this;
+  }
+
+  public MenuItemAssert isActionViewExpanded() {
+    isNotNull();
+    assertThat(actual.isActionViewExpanded()) //
+        .overridingErrorMessage("Expected expanded action view but action view was collapsed.") //
+        .isTrue();
+    return this;
+  }
+
+  public MenuItemAssert isActionViewCollapsed() {
+    isNotNull();
+    assertThat(actual.isActionViewExpanded()) //
+        .overridingErrorMessage("Expected collapsed action view but action view was expanded.") //
+        .isFalse();
+    return this;
+  }
+
+  public MenuItemAssert isCheckable() {
+    isNotNull();
+    assertThat(actual.isCheckable()) //
+        .overridingErrorMessage("Expected to be checkable but was not checkable.") //
+        .isTrue();
+    return this;
+  }
+
+  public MenuItemAssert isNotCheckable() {
+    isNotNull();
+    assertThat(actual.isCheckable()) //
+        .overridingErrorMessage("Expected to not be checkable but was checkable.") //
+        .isFalse();
+    return this;
+  }
+
+  public MenuItemAssert isChecked() {
+    isNotNull();
+    assertThat(actual.isChecked()) //
+        .overridingErrorMessage("Expected to be checked but was not checked.") //
+        .isTrue();
+    return this;
+  }
+
+  public MenuItemAssert isNotChecked() {
+    isNotNull();
+    assertThat(actual.isChecked()) //
+        .overridingErrorMessage("Expected to not be checked but was checked.") //
+        .isFalse();
+    return this;
+  }
+
+  public MenuItemAssert isEnabled() {
+    isNotNull();
+    assertThat(actual.isEnabled()) //
+        .overridingErrorMessage("Expected to be enabled but was disabled.") //
+        .isTrue();
+    return this;
+  }
+
+  public MenuItemAssert isDisabled() {
+    isNotNull();
+    assertThat(actual.isEnabled()) //
+        .overridingErrorMessage("Expected to be disabled but was enabled.") //
+        .isFalse();
+    return this;
+  }
+
+  public MenuItemAssert isVisible() {
+    isNotNull();
+    assertThat(actual.isVisible()) //
+        .overridingErrorMessage("Expected to be visible but was not visible.") //
+        .isTrue();
+    return this;
+  }
+
+  public MenuItemAssert isNotVisible() {
+    isNotNull();
+    assertThat(actual.isVisible()) //
+        .overridingErrorMessage("Expected to not be visible but was visible.") //
+        .isFalse();
+    return this;
+  }
+}
diff --git a/actionbarsherlock-i18n/AndroidManifest.xml b/actionbarsherlock-i18n/AndroidManifest.xml
new file mode 100755
index 0000000..ede074e
--- /dev/null
+++ b/actionbarsherlock-i18n/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock.i18n">
+</manifest>
diff --git a/actionbarsherlock-i18n/README.md b/actionbarsherlock-i18n/README.md
new file mode 100755
index 0000000..c87bb51
--- /dev/null
+++ b/actionbarsherlock-i18n/README.md
@@ -0,0 +1,7 @@
+ActionBarSherlock i18n
+======================
+
+A library project which has translations of all of the strings used by ActionBarSherlock in the
+most popular languages.
+
+To update run `mvn org.holoeverywhere:resbuilder:build`.
diff --git a/actionbarsherlock-i18n/pom.xml b/actionbarsherlock-i18n/pom.xml
new file mode 100755
index 0000000..cdfafc0
--- /dev/null
+++ b/actionbarsherlock-i18n/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>actionbarsherlock-i18n</artifactId>
+  <name>ActionBarSherlock i18n</name>
+  <packaging>apklib</packaging>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.actionbarsherlock</groupId>
+      <artifactId>actionbarsherlock</artifactId>
+      <version>${project.version}</version>
+      <type>apklib</type>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>support-v4</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.holoeverywhere</groupId>
+        <artifactId>resbuilder</artifactId>
+        <configuration>
+          <androidSdkPath>${env.ANDROID_HOME}</androidSdkPath>
+          <includeDirs>
+            <dir>${project.basedir}</dir>
+          </includeDirs>
+          <inputFiles>
+            <file>strings.json:strings</file>
+          </inputFiles>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/actionbarsherlock-i18n/project.properties b/actionbarsherlock-i18n/project.properties
new file mode 100755
index 0000000..37d775e
--- /dev/null
+++ b/actionbarsherlock-i18n/project.properties
@@ -0,0 +1,19 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-14
+android.library=true
+android.library.reference.1=../actionbarsherlock
+
+
+
+
+
+
diff --git a/actionbarsherlock-i18n/res/values-af/abs__strings.xml b/actionbarsherlock-i18n/res/values-af/abs__strings.xml
new file mode 100755
index 0000000..6324caa
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-af/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navigeer tuis"</string>
+    <string name="abs__action_bar_up_description">"Navigeer op"</string>
+    <string name="abs__action_menu_overflow_description">"Meer opsies"</string>
+    <string name="abs__action_mode_done">"Klaar"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Kies aktiwiteit"</string>
+    <string name="abs__activity_chooser_view_see_all">"Sien alle"</string>
+    <string name="abs__activitychooserview_choose_application">"Kies \'n program"</string>
+    <string name="abs__searchview_description_clear">"Maak navraag skoon"</string>
+    <string name="abs__searchview_description_query">"Soeknavraag"</string>
+    <string name="abs__searchview_description_search">"Soek"</string>
+    <string name="abs__searchview_description_submit">"Dien navraag in"</string>
+    <string name="abs__searchview_description_voice">"Stemsoektog"</string>
+    <string name="abs__share_action_provider_share_with">"Deel met"</string>
+    <string name="abs__shareactionprovider_share_with">"Deel met"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Deel met %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-am/abs__strings.xml b/actionbarsherlock-i18n/res/values-am/abs__strings.xml
new file mode 100755
index 0000000..5a7be18
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-am/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"መነሻ ዳስስ"</string>
+    <string name="abs__action_bar_up_description">"አስስ"</string>
+    <string name="abs__action_menu_overflow_description">"ተጨማሪ አማራጮች"</string>
+    <string name="abs__action_mode_done">"ተከናውኗል"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"እንቅስቃሴ ምረጥ"</string>
+    <string name="abs__activity_chooser_view_see_all">"ሁሉንም ተመልከት"</string>
+    <string name="abs__activitychooserview_choose_application">"መተግበሪያ ምረጥ"</string>
+    <string name="abs__searchview_description_clear">"ጥያቄ አጥራ"</string>
+    <string name="abs__searchview_description_query">"ጥያቄ ፍለጋ"</string>
+    <string name="abs__searchview_description_search">"ፈልግ"</string>
+    <string name="abs__searchview_description_submit">"ጥያቄ አስረክብ"</string>
+    <string name="abs__searchview_description_voice">"የድምፅ ፍለጋ"</string>
+    <string name="abs__share_action_provider_share_with">"ተጋራ ከ"</string>
+    <string name="abs__shareactionprovider_share_with">"ተጋራ ከ"</string>
+    <string name="abs__shareactionprovider_share_with_application">"ከ %s ጋር ተጋራ"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-ar/abs__strings.xml b/actionbarsherlock-i18n/res/values-ar/abs__strings.xml
new file mode 100755
index 0000000..292abc6
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-ar/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"التنقل إلى الشاشة الرئيسية"</string>
+    <string name="abs__action_bar_up_description">"التنقل إلى أعلى"</string>
+    <string name="abs__action_menu_overflow_description">"المزيد من الخيارات"</string>
+    <string name="abs__action_mode_done">"تم"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"اختيار نشاط"</string>
+    <string name="abs__activity_chooser_view_see_all">"عرض الكل"</string>
+    <string name="abs__activitychooserview_choose_application">"اختيار تطبيق"</string>
+    <string name="abs__searchview_description_clear">"محو طلب البحث"</string>
+    <string name="abs__searchview_description_query">"طلب البحث"</string>
+    <string name="abs__searchview_description_search">"بحث"</string>
+    <string name="abs__searchview_description_submit">"إرسال طلب البحث"</string>
+    <string name="abs__searchview_description_voice">"البحث الصوتي"</string>
+    <string name="abs__share_action_provider_share_with">"مشاركة مع"</string>
+    <string name="abs__shareactionprovider_share_with">"مشاركة مع"</string>
+    <string name="abs__shareactionprovider_share_with_application">"مشاركة مع %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-be/abs__strings.xml b/actionbarsherlock-i18n/res/values-be/abs__strings.xml
new file mode 100755
index 0000000..f382d5c
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-be/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Перайсці да пачатковай старонкі"</string>
+    <string name="abs__action_bar_up_description">"Перайсці ўверх"</string>
+    <string name="abs__action_menu_overflow_description">"Больш налад"</string>
+    <string name="abs__action_mode_done">"Гатова"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Выберыце працэс"</string>
+    <string name="abs__activity_chooser_view_see_all">"Прагледзець усё"</string>
+    <string name="abs__activitychooserview_choose_application">"Выберыце прыкладанне"</string>
+    <string name="abs__searchview_description_clear">"Выдаліць запыт"</string>
+    <string name="abs__searchview_description_query">"Запыт на пошук"</string>
+    <string name="abs__searchview_description_search">"Пошук"</string>
+    <string name="abs__searchview_description_submit">"Адправіць запыт"</string>
+    <string name="abs__searchview_description_voice">"Галасавы пошук"</string>
+    <string name="abs__share_action_provider_share_with">"Апублікаваць з дапамогай"</string>
+    <string name="abs__shareactionprovider_share_with">"Апублікаваць з дапамогай"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Адправiць з дапамогай прыкладання %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-bg/abs__strings.xml b/actionbarsherlock-i18n/res/values-bg/abs__strings.xml
new file mode 100755
index 0000000..e627ded
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-bg/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Придвижване към „Начало“"</string>
+    <string name="abs__action_bar_up_description">"Придвижване нагоре"</string>
+    <string name="abs__action_menu_overflow_description">"Още опции"</string>
+    <string name="abs__action_mode_done">"Готово"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Избор на активност"</string>
+    <string name="abs__activity_chooser_view_see_all">"Вижте всички"</string>
+    <string name="abs__activitychooserview_choose_application">"Изберете приложение"</string>
+    <string name="abs__searchview_description_clear">"Изчистване на заявката"</string>
+    <string name="abs__searchview_description_query">"Заявка за търсене"</string>
+    <string name="abs__searchview_description_search">"Търсене"</string>
+    <string name="abs__searchview_description_submit">"Изпращане на заявката"</string>
+    <string name="abs__searchview_description_voice">"Гласово търсене"</string>
+    <string name="abs__share_action_provider_share_with">"Споделяне със:"</string>
+    <string name="abs__shareactionprovider_share_with">"Споделяне със"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Споделяне със: %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-ca/abs__strings.xml b/actionbarsherlock-i18n/res/values-ca/abs__strings.xml
new file mode 100755
index 0000000..145c8b3
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-ca/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Torna a la pàgina d\'inici"</string>
+    <string name="abs__action_bar_up_description">"Mou cap a dalt"</string>
+    <string name="abs__action_menu_overflow_description">"Més opcions"</string>
+    <string name="abs__action_mode_done">"Fet"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Selecció de l\'activitat"</string>
+    <string name="abs__activity_chooser_view_see_all">"Mostra-les totes"</string>
+    <string name="abs__activitychooserview_choose_application">"Selecciona una aplicació"</string>
+    <string name="abs__searchview_description_clear">"Neteja la consulta"</string>
+    <string name="abs__searchview_description_query">"Consulta de cerca"</string>
+    <string name="abs__searchview_description_search">"Cerca"</string>
+    <string name="abs__searchview_description_submit">"Envia la consulta"</string>
+    <string name="abs__searchview_description_voice">"Cerca per veu"</string>
+    <string name="abs__share_action_provider_share_with">"Comparteix amb"</string>
+    <string name="abs__shareactionprovider_share_with">"Comparteix amb"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Comparteix amb %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-cs/abs__strings.xml b/actionbarsherlock-i18n/res/values-cs/abs__strings.xml
new file mode 100755
index 0000000..3d075fb
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-cs/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Přejít na plochu"</string>
+    <string name="abs__action_bar_up_description">"Přejít nahoru"</string>
+    <string name="abs__action_menu_overflow_description">"Další možnosti"</string>
+    <string name="abs__action_mode_done">"Hotovo"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Vybrat aktivitu"</string>
+    <string name="abs__activity_chooser_view_see_all">"Zobrazit vše"</string>
+    <string name="abs__activitychooserview_choose_application">"Vybrat aplikaci"</string>
+    <string name="abs__searchview_description_clear">"Smazat dotaz"</string>
+    <string name="abs__searchview_description_query">"Vyhledávací dotaz"</string>
+    <string name="abs__searchview_description_search">"Vyhledávat"</string>
+    <string name="abs__searchview_description_submit">"Odeslat dotaz"</string>
+    <string name="abs__searchview_description_voice">"Hlasové vyhledávání"</string>
+    <string name="abs__share_action_provider_share_with">"Sdílet s"</string>
+    <string name="abs__shareactionprovider_share_with">"Sdílet s"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Sdílet s aplikací %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-da/abs__strings.xml b/actionbarsherlock-i18n/res/values-da/abs__strings.xml
new file mode 100755
index 0000000..c2b88e2
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-da/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Naviger hjem"</string>
+    <string name="abs__action_bar_up_description">"Naviger op"</string>
+    <string name="abs__action_menu_overflow_description">"Flere valgmuligheder"</string>
+    <string name="abs__action_mode_done">"Udført"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Vælg aktivitet"</string>
+    <string name="abs__activity_chooser_view_see_all">"Se alle"</string>
+    <string name="abs__activitychooserview_choose_application">"Vælg en app"</string>
+    <string name="abs__searchview_description_clear">"Ryd forespørgslen"</string>
+    <string name="abs__searchview_description_query">"Søgeforespørgsel"</string>
+    <string name="abs__searchview_description_search">"Søg"</string>
+    <string name="abs__searchview_description_submit">"Indsend forespørgslen"</string>
+    <string name="abs__searchview_description_voice">"Stemmesøgning"</string>
+    <string name="abs__share_action_provider_share_with">"Del med"</string>
+    <string name="abs__shareactionprovider_share_with">"Del med"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Del med %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-de/abs__strings.xml b/actionbarsherlock-i18n/res/values-de/abs__strings.xml
new file mode 100755
index 0000000..a89fc52
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-de/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Zur Startseite navigieren"</string>
+    <string name="abs__action_bar_up_description">"Nach oben navigieren"</string>
+    <string name="abs__action_menu_overflow_description">"Weitere Optionen"</string>
+    <string name="abs__action_mode_done">"Fertig"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Aktivität wählen"</string>
+    <string name="abs__activity_chooser_view_see_all">"Alle anzeigen"</string>
+    <string name="abs__activitychooserview_choose_application">"App auswählen"</string>
+    <string name="abs__searchview_description_clear">"Anfrage löschen"</string>
+    <string name="abs__searchview_description_query">"Suchanfrage"</string>
+    <string name="abs__searchview_description_search">"Suche"</string>
+    <string name="abs__searchview_description_submit">"Anfrage senden"</string>
+    <string name="abs__searchview_description_voice">"Sprachsuche"</string>
+    <string name="abs__share_action_provider_share_with">"Teilen mit"</string>
+    <string name="abs__shareactionprovider_share_with">"Teilen mit"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Mit %s teilen"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-el/abs__strings.xml b/actionbarsherlock-i18n/res/values-el/abs__strings.xml
new file mode 100755
index 0000000..ea07230
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-el/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Πλοήγηση στην αρχική σελίδα"</string>
+    <string name="abs__action_bar_up_description">"Πλοήγηση προς τα επάνω"</string>
+    <string name="abs__action_menu_overflow_description">"Περισσότερες επιλογές"</string>
+    <string name="abs__action_mode_done">"Ολοκληρώθηκε"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Επιλογή δραστηριότητας"</string>
+    <string name="abs__activity_chooser_view_see_all">"Εμφάνιση όλων"</string>
+    <string name="abs__activitychooserview_choose_application">"Επιλέξτε κάποια εφαρμογή"</string>
+    <string name="abs__searchview_description_clear">"Απαλοιφή ερωτήματος"</string>
+    <string name="abs__searchview_description_query">"Ερώτημα αναζήτησης"</string>
+    <string name="abs__searchview_description_search">"Αναζήτηση"</string>
+    <string name="abs__searchview_description_submit">"Υποβολή ερωτήματος"</string>
+    <string name="abs__searchview_description_voice">"Φωνητική αναζήτηση"</string>
+    <string name="abs__share_action_provider_share_with">"Κοινή χρήση με"</string>
+    <string name="abs__shareactionprovider_share_with">"Κοινή χρήση με"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Κοινή χρήση με %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-en-rGB/abs__strings.xml b/actionbarsherlock-i18n/res/values-en-rGB/abs__strings.xml
new file mode 100755
index 0000000..1980054
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-en-rGB/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navigate home"</string>
+    <string name="abs__action_bar_up_description">"Navigate up"</string>
+    <string name="abs__action_menu_overflow_description">"More options"</string>
+    <string name="abs__action_mode_done">"Done"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Choose activity"</string>
+    <string name="abs__activity_chooser_view_see_all">"See all"</string>
+    <string name="abs__activitychooserview_choose_application">"Choose an app"</string>
+    <string name="abs__searchview_description_clear">"Clear query"</string>
+    <string name="abs__searchview_description_query">"Search query"</string>
+    <string name="abs__searchview_description_search">"Search"</string>
+    <string name="abs__searchview_description_submit">"Submit query"</string>
+    <string name="abs__searchview_description_voice">"Voice search"</string>
+    <string name="abs__share_action_provider_share_with">"Share with"</string>
+    <string name="abs__shareactionprovider_share_with">"Share with"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Share with %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-es-rUS/abs__strings.xml b/actionbarsherlock-i18n/res/values-es-rUS/abs__strings.xml
new file mode 100755
index 0000000..d9b2cec
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-es-rUS/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Desplazarse hasta la página principal"</string>
+    <string name="abs__action_bar_up_description">"Desplazarse hacia arriba"</string>
+    <string name="abs__action_menu_overflow_description">"Más opciones"</string>
+    <string name="abs__action_mode_done">"Listo"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Elige actividad"</string>
+    <string name="abs__activity_chooser_view_see_all">"Ver todas"</string>
+    <string name="abs__activitychooserview_choose_application">"Elige una aplicación."</string>
+    <string name="abs__searchview_description_clear">"Eliminar la consulta"</string>
+    <string name="abs__searchview_description_query">"Consulta de búsqueda"</string>
+    <string name="abs__searchview_description_search">"Buscar"</string>
+    <string name="abs__searchview_description_submit">"Enviar consulta"</string>
+    <string name="abs__searchview_description_voice">"Búsqueda por voz"</string>
+    <string name="abs__share_action_provider_share_with">"Compartir con"</string>
+    <string name="abs__shareactionprovider_share_with">"Compartir con"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Compartir con %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-es/abs__strings.xml b/actionbarsherlock-i18n/res/values-es/abs__strings.xml
new file mode 100755
index 0000000..6325a04
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-es/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Ir al escritorio"</string>
+    <string name="abs__action_bar_up_description">"Desplazarse hacia arriba"</string>
+    <string name="abs__action_menu_overflow_description">"Más opciones"</string>
+    <string name="abs__action_mode_done">"Listo"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Seleccionar actividad"</string>
+    <string name="abs__activity_chooser_view_see_all">"Ver todo"</string>
+    <string name="abs__activitychooserview_choose_application">"Seleccionar una aplicación"</string>
+    <string name="abs__searchview_description_clear">"Borrar consulta"</string>
+    <string name="abs__searchview_description_query">"Consulta"</string>
+    <string name="abs__searchview_description_search">"Buscar"</string>
+    <string name="abs__searchview_description_submit">"Enviar consulta"</string>
+    <string name="abs__searchview_description_voice">"Búsqueda por voz"</string>
+    <string name="abs__share_action_provider_share_with">"Compartir con"</string>
+    <string name="abs__shareactionprovider_share_with">"Compartir con"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Compartir con %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-et/abs__strings.xml b/actionbarsherlock-i18n/res/values-et/abs__strings.xml
new file mode 100755
index 0000000..cbaa1e1
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-et/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Liigu avalehele"</string>
+    <string name="abs__action_bar_up_description">"Liigu üles"</string>
+    <string name="abs__action_menu_overflow_description">"Rohkem valikuid"</string>
+    <string name="abs__action_mode_done">"Valmis"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Tegevuse valimine"</string>
+    <string name="abs__activity_chooser_view_see_all">"Kuva kõik"</string>
+    <string name="abs__activitychooserview_choose_application">"Valige rakendus"</string>
+    <string name="abs__searchview_description_clear">"Tühjenda päring"</string>
+    <string name="abs__searchview_description_query">"Otsingupäring"</string>
+    <string name="abs__searchview_description_search">"Otsing"</string>
+    <string name="abs__searchview_description_submit">"Päringu esitamine"</string>
+    <string name="abs__searchview_description_voice">"Häälotsing"</string>
+    <string name="abs__share_action_provider_share_with">"Jagamine rakendusega:"</string>
+    <string name="abs__shareactionprovider_share_with">"Jaga:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Jaga rakendusega %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-fa/abs__strings.xml b/actionbarsherlock-i18n/res/values-fa/abs__strings.xml
new file mode 100755
index 0000000..81f8ea4
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-fa/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"رفتن به صفحهٔ اصلی"</string>
+    <string name="abs__action_bar_up_description">"حرکت به بالا"</string>
+    <string name="abs__action_menu_overflow_description">"سایر گزینه‌ها"</string>
+    <string name="abs__action_mode_done">"انجام شد"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"انتخاب فعالیت"</string>
+    <string name="abs__activity_chooser_view_see_all">"مشاهده همه"</string>
+    <string name="abs__activitychooserview_choose_application">"انتخاب برنامه"</string>
+    <string name="abs__searchview_description_clear">"پاک کردن عبارت جستجو"</string>
+    <string name="abs__searchview_description_query">"درخواست جستجو"</string>
+    <string name="abs__searchview_description_search">"جستجو"</string>
+    <string name="abs__searchview_description_submit">"ارسال عبارت جستجو"</string>
+    <string name="abs__searchview_description_voice">"جستجوی صوتی"</string>
+    <string name="abs__share_action_provider_share_with">"اشتراک‌گذاری با"</string>
+    <string name="abs__shareactionprovider_share_with">"اشتراک‌گذاری با"</string>
+    <string name="abs__shareactionprovider_share_with_application">"اشتراک‌گذاری با %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-fi/abs__strings.xml b/actionbarsherlock-i18n/res/values-fi/abs__strings.xml
new file mode 100755
index 0000000..e1f8176
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-fi/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Siirry etusivulle"</string>
+    <string name="abs__action_bar_up_description">"Siirry ylös"</string>
+    <string name="abs__action_menu_overflow_description">"Lisää asetuksia"</string>
+    <string name="abs__action_mode_done">"Valmis"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Valitse toiminto"</string>
+    <string name="abs__activity_chooser_view_see_all">"Näytä kaikki"</string>
+    <string name="abs__activitychooserview_choose_application">"Valitse sovellus"</string>
+    <string name="abs__searchview_description_clear">"Tyhjennä kysely"</string>
+    <string name="abs__searchview_description_query">"Hakulauseke"</string>
+    <string name="abs__searchview_description_search">"Haku"</string>
+    <string name="abs__searchview_description_submit">"Lähetä kysely"</string>
+    <string name="abs__searchview_description_voice">"Puhehaku"</string>
+    <string name="abs__share_action_provider_share_with">"Jaa seuraavien kanssa"</string>
+    <string name="abs__shareactionprovider_share_with">"Jaa seuraavien kanssa:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Jaa sovelluksessa %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-fr/abs__strings.xml b/actionbarsherlock-i18n/res/values-fr/abs__strings.xml
new file mode 100755
index 0000000..383eee7
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-fr/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Retour à l\'accueil"</string>
+    <string name="abs__action_bar_up_description">"Parcourir vers le haut"</string>
+    <string name="abs__action_menu_overflow_description">"Plus d\'options"</string>
+    <string name="abs__action_mode_done">"OK"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Sélectionnez une activité"</string>
+    <string name="abs__activity_chooser_view_see_all">"Tout afficher"</string>
+    <string name="abs__activitychooserview_choose_application">"Sélectionnez une application"</string>
+    <string name="abs__searchview_description_clear">"Effacer la requête"</string>
+    <string name="abs__searchview_description_query">"Requête de recherche"</string>
+    <string name="abs__searchview_description_search">"Rechercher"</string>
+    <string name="abs__searchview_description_submit">"Envoyer la requête"</string>
+    <string name="abs__searchview_description_voice">"Recherche vocale"</string>
+    <string name="abs__share_action_provider_share_with">"Partager avec"</string>
+    <string name="abs__shareactionprovider_share_with">"Partager avec"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Partager avec %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-he/abs__strings.xml b/actionbarsherlock-i18n/res/values-he/abs__strings.xml
new file mode 100755
index 0000000..eebe8e5
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-he/abs__strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>

+<resources>

+  <string name="abs__action_bar_home_description">נווט אל הבית</string>

+  <string name="abs__action_bar_up_description">נווט למעלה</string>

+  <string name="abs__action_menu_overflow_description">אפשרויות נוספות</string>

+  <string name="abs__action_mode_done">בוצע</string>

+  <string name="abs__activity_chooser_view_see_all">הצג הכל…</string>

+  <string name="abs__activitychooserview_choose_application">בחר יישום</string>

+  <string name="abs__shareactionprovider_share_with">שתף עם</string>

+  <string name="abs__shareactionprovider_share_with_application">שיתוף עם </string>

+</resources>

diff --git a/actionbarsherlock-i18n/res/values-hi/abs__strings.xml b/actionbarsherlock-i18n/res/values-hi/abs__strings.xml
new file mode 100755
index 0000000..ee0ac0e
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-hi/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"होम पर नेविगेट करें"</string>
+    <string name="abs__action_bar_up_description">"ऊपर नेविगेट करें"</string>
+    <string name="abs__action_menu_overflow_description">"अधिक विकल्प"</string>
+    <string name="abs__action_mode_done">"पूर्ण"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"गतिविधि चुनें"</string>
+    <string name="abs__activity_chooser_view_see_all">"सभी देखें"</string>
+    <string name="abs__activitychooserview_choose_application">"कोई एप्‍लिकेशन चुनें"</string>
+    <string name="abs__searchview_description_clear">"क्‍वेरी साफ़ करें"</string>
+    <string name="abs__searchview_description_query">"खोज क्वेरी"</string>
+    <string name="abs__searchview_description_search">"खोजें"</string>
+    <string name="abs__searchview_description_submit">"क्वेरी सबमिट करें"</string>
+    <string name="abs__searchview_description_voice">"ध्वनि खोज"</string>
+    <string name="abs__share_action_provider_share_with">"इसके साथ साझा करें:"</string>
+    <string name="abs__shareactionprovider_share_with">"इसके साथ साझा करें:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"%s के साथ साझा करें"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-hr/abs__strings.xml b/actionbarsherlock-i18n/res/values-hr/abs__strings.xml
new file mode 100755
index 0000000..4dab96a
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-hr/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Kreni na početnu"</string>
+    <string name="abs__action_bar_up_description">"Kreni gore"</string>
+    <string name="abs__action_menu_overflow_description">"Više opcija"</string>
+    <string name="abs__action_mode_done">"Gotovo"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Odabir aktivnosti"</string>
+    <string name="abs__activity_chooser_view_see_all">"Prikaži sve"</string>
+    <string name="abs__activitychooserview_choose_application">"Odabir aplikacije"</string>
+    <string name="abs__searchview_description_clear">"Izbriši upit"</string>
+    <string name="abs__searchview_description_query">"Upit za pretraživanje"</string>
+    <string name="abs__searchview_description_search">"Pretraživanje"</string>
+    <string name="abs__searchview_description_submit">"Pošalji upit"</string>
+    <string name="abs__searchview_description_voice">"Glasovno pretraživanje"</string>
+    <string name="abs__share_action_provider_share_with">"Dijeljenje s"</string>
+    <string name="abs__shareactionprovider_share_with">"Dijeljenje sa"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Dijeli s aplikacijom %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-hu/abs__strings.xml b/actionbarsherlock-i18n/res/values-hu/abs__strings.xml
new file mode 100755
index 0000000..031698a
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-hu/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Ugrás a főoldalra"</string>
+    <string name="abs__action_bar_up_description">"Felfele mozgás"</string>
+    <string name="abs__action_menu_overflow_description">"További lehetőségek"</string>
+    <string name="abs__action_mode_done">"Kész"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Tevékenység kiválasztása"</string>
+    <string name="abs__activity_chooser_view_see_all">"Összes megtekintése"</string>
+    <string name="abs__activitychooserview_choose_application">"Válasszon ki egy alkalmazást"</string>
+    <string name="abs__searchview_description_clear">"Lekérdezés törlése"</string>
+    <string name="abs__searchview_description_query">"Keresési lekérdezés"</string>
+    <string name="abs__searchview_description_search">"Keresés"</string>
+    <string name="abs__searchview_description_submit">"Lekérdezés küldése"</string>
+    <string name="abs__searchview_description_voice">"Hangalapú keresés"</string>
+    <string name="abs__share_action_provider_share_with">"Megosztás"</string>
+    <string name="abs__shareactionprovider_share_with">"Megosztás a következővel:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Ossza meg a következő alkalmazással: %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-in/abs__strings.xml b/actionbarsherlock-i18n/res/values-in/abs__strings.xml
new file mode 100755
index 0000000..e9dcfca
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-in/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navigasi ke beranda"</string>
+    <string name="abs__action_bar_up_description">"Navigasi naik"</string>
+    <string name="abs__action_menu_overflow_description">"Opsi lainnya"</string>
+    <string name="abs__action_mode_done">"Selesai"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Pilih kegiatan"</string>
+    <string name="abs__activity_chooser_view_see_all">"Lihat semua"</string>
+    <string name="abs__activitychooserview_choose_application">"Pilih apl"</string>
+    <string name="abs__searchview_description_clear">"Hapus kueri"</string>
+    <string name="abs__searchview_description_query">"Kueri penelusuran"</string>
+    <string name="abs__searchview_description_search">"Penelusuran"</string>
+    <string name="abs__searchview_description_submit">"Mengirimkan kueri"</string>
+    <string name="abs__searchview_description_voice">"Penelusuran suara"</string>
+    <string name="abs__share_action_provider_share_with">"Berbagi dengan"</string>
+    <string name="abs__shareactionprovider_share_with">"Berbagi dengan"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Berbagi dengan %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-it/abs__strings.xml b/actionbarsherlock-i18n/res/values-it/abs__strings.xml
new file mode 100755
index 0000000..c23aa13
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-it/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Vai alla home page"</string>
+    <string name="abs__action_bar_up_description">"Vai in alto"</string>
+    <string name="abs__action_menu_overflow_description">"Altre opzioni"</string>
+    <string name="abs__action_mode_done">"Fine"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Scegli attività"</string>
+    <string name="abs__activity_chooser_view_see_all">"Mostra tutto"</string>
+    <string name="abs__activitychooserview_choose_application">"Scegli un\'applicazione"</string>
+    <string name="abs__searchview_description_clear">"Cancella query"</string>
+    <string name="abs__searchview_description_query">"Query di ricerca"</string>
+    <string name="abs__searchview_description_search">"Cerca"</string>
+    <string name="abs__searchview_description_submit">"Invia query"</string>
+    <string name="abs__searchview_description_voice">"Ricerca vocale"</string>
+    <string name="abs__share_action_provider_share_with">"Condividi con"</string>
+    <string name="abs__shareactionprovider_share_with">"Condividi con"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Condividi con %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-iw/abs__strings.xml b/actionbarsherlock-i18n/res/values-iw/abs__strings.xml
new file mode 100755
index 0000000..197843a
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-iw/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"נווט לדף הבית"</string>
+    <string name="abs__action_bar_up_description">"נווט למעלה"</string>
+    <string name="abs__action_menu_overflow_description">"אפשרויות נוספות"</string>
+    <string name="abs__action_mode_done">"סיום"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"בחר פעילות"</string>
+    <string name="abs__activity_chooser_view_see_all">"הצג הכל"</string>
+    <string name="abs__activitychooserview_choose_application">"בחר יישום"</string>
+    <string name="abs__searchview_description_clear">"נקה שאילתה"</string>
+    <string name="abs__searchview_description_query">"שאילתת חיפוש"</string>
+    <string name="abs__searchview_description_search">"חיפוש"</string>
+    <string name="abs__searchview_description_submit">"שלח שאילתה"</string>
+    <string name="abs__searchview_description_voice">"חיפוש קולי"</string>
+    <string name="abs__share_action_provider_share_with">"שתף עם"</string>
+    <string name="abs__shareactionprovider_share_with">"שתף עם"</string>
+    <string name="abs__shareactionprovider_share_with_application">"שתף עם %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-ja/abs__strings.xml b/actionbarsherlock-i18n/res/values-ja/abs__strings.xml
new file mode 100755
index 0000000..1fb8580
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-ja/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"ホームへ移動"</string>
+    <string name="abs__action_bar_up_description">"上へ移動"</string>
+    <string name="abs__action_menu_overflow_description">"その他のオプション"</string>
+    <string name="abs__action_mode_done">"完了"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"操作の選択"</string>
+    <string name="abs__activity_chooser_view_see_all">"すべて表示"</string>
+    <string name="abs__activitychooserview_choose_application">"アプリの選択"</string>
+    <string name="abs__searchview_description_clear">"検索キーワードを削除"</string>
+    <string name="abs__searchview_description_query">"検索キーワード"</string>
+    <string name="abs__searchview_description_search">"検索"</string>
+    <string name="abs__searchview_description_submit">"検索キーワードを送信"</string>
+    <string name="abs__searchview_description_voice">"音声検索"</string>
+    <string name="abs__share_action_provider_share_with">"共有"</string>
+    <string name="abs__shareactionprovider_share_with">"共有"</string>
+    <string name="abs__shareactionprovider_share_with_application">"%sと共有"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-ko/abs__strings.xml b/actionbarsherlock-i18n/res/values-ko/abs__strings.xml
new file mode 100755
index 0000000..898fea1
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-ko/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"홈 탐색"</string>
+    <string name="abs__action_bar_up_description">"위로 탐색"</string>
+    <string name="abs__action_menu_overflow_description">"옵션 더보기"</string>
+    <string name="abs__action_mode_done">"완료"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"작업 선택"</string>
+    <string name="abs__activity_chooser_view_see_all">"전체 보기"</string>
+    <string name="abs__activitychooserview_choose_application">"앱 선택"</string>
+    <string name="abs__searchview_description_clear">"검색어 삭제"</string>
+    <string name="abs__searchview_description_query">"검색어"</string>
+    <string name="abs__searchview_description_search">"검색"</string>
+    <string name="abs__searchview_description_submit">"검색어 보내기"</string>
+    <string name="abs__searchview_description_voice">"음성 검색"</string>
+    <string name="abs__share_action_provider_share_with">"공유 대상"</string>
+    <string name="abs__shareactionprovider_share_with">"공유 대상:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"%s와(과) 공유"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-lt/abs__strings.xml b/actionbarsherlock-i18n/res/values-lt/abs__strings.xml
new file mode 100755
index 0000000..6e1505f
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-lt/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Naršyti pagrindinį puslapį"</string>
+    <string name="abs__action_bar_up_description">"Naršyti į viršų"</string>
+    <string name="abs__action_menu_overflow_description">"Daugiau parinkčių"</string>
+    <string name="abs__action_mode_done">"Atlikta"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Pasirinkti veiklą"</string>
+    <string name="abs__activity_chooser_view_see_all">"Žr. viską"</string>
+    <string name="abs__activitychooserview_choose_application">"Pasirinkite programą"</string>
+    <string name="abs__searchview_description_clear">"Išvalyti užklausą"</string>
+    <string name="abs__searchview_description_query">"Paieškos užklausa"</string>
+    <string name="abs__searchview_description_search">"Ieškoti"</string>
+    <string name="abs__searchview_description_submit">"Patvirtinti užklausą"</string>
+    <string name="abs__searchview_description_voice">"Paieška balsu"</string>
+    <string name="abs__share_action_provider_share_with">"Bendrinti su"</string>
+    <string name="abs__shareactionprovider_share_with">"Bendrinti su"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Bendrinti su „%s“"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-lv/abs__strings.xml b/actionbarsherlock-i18n/res/values-lv/abs__strings.xml
new file mode 100755
index 0000000..a289e9c
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-lv/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Pārvietoties uz sākuma ekrānu"</string>
+    <string name="abs__action_bar_up_description">"Pārvietoties augšup"</string>
+    <string name="abs__action_menu_overflow_description">"Vairāk opciju"</string>
+    <string name="abs__action_mode_done">"Gatavs"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Darbības izvēle"</string>
+    <string name="abs__activity_chooser_view_see_all">"Skatīt visu"</string>
+    <string name="abs__activitychooserview_choose_application">"Izvēlieties lietotni"</string>
+    <string name="abs__searchview_description_clear">"Notīrīt vaicājumu"</string>
+    <string name="abs__searchview_description_query">"Meklēšanas vaicājums"</string>
+    <string name="abs__searchview_description_search">"Meklēt"</string>
+    <string name="abs__searchview_description_submit">"Iesniedziet vaicājumu."</string>
+    <string name="abs__searchview_description_voice">"Meklēšana ar balsi"</string>
+    <string name="abs__share_action_provider_share_with">"Kopīgošana ar:"</string>
+    <string name="abs__shareactionprovider_share_with">"Kopīgot ar:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Kopīgot ar lietojumprogrammu %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-ms/abs__strings.xml b/actionbarsherlock-i18n/res/values-ms/abs__strings.xml
new file mode 100755
index 0000000..5251186
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-ms/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navigasi laman utama"</string>
+    <string name="abs__action_bar_up_description">"Navigasi ke atas"</string>
+    <string name="abs__action_menu_overflow_description">"Lagi pilihan"</string>
+    <string name="abs__action_mode_done">"Selesai"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Pilih aktiviti"</string>
+    <string name="abs__activity_chooser_view_see_all">"Lihat semua"</string>
+    <string name="abs__activitychooserview_choose_application">"Pilih apl"</string>
+    <string name="abs__searchview_description_clear">"Pertanyaan jelas"</string>
+    <string name="abs__searchview_description_query">"Pertanyaan carian"</string>
+    <string name="abs__searchview_description_search">"Carian"</string>
+    <string name="abs__searchview_description_submit">"Serah pertanyaan"</string>
+    <string name="abs__searchview_description_voice">"Carian suara"</string>
+    <string name="abs__share_action_provider_share_with">"Kongsi dengan"</string>
+    <string name="abs__shareactionprovider_share_with">"Kongsi dengan"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Kongsi dengan %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-nb/abs__strings.xml b/actionbarsherlock-i18n/res/values-nb/abs__strings.xml
new file mode 100755
index 0000000..7092d00
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-nb/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Gå til startsiden"</string>
+    <string name="abs__action_bar_up_description">"Gå opp"</string>
+    <string name="abs__action_menu_overflow_description">"Flere alternativer"</string>
+    <string name="abs__action_mode_done">"Ferdig"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Velg aktivitet"</string>
+    <string name="abs__activity_chooser_view_see_all">"Se alle"</string>
+    <string name="abs__activitychooserview_choose_application">"Velg en app"</string>
+    <string name="abs__searchview_description_clear">"Slett søket"</string>
+    <string name="abs__searchview_description_query">"Søkeord"</string>
+    <string name="abs__searchview_description_search">"Søk"</string>
+    <string name="abs__searchview_description_submit">"Send inn spørsmål"</string>
+    <string name="abs__searchview_description_voice">"Talesøk"</string>
+    <string name="abs__share_action_provider_share_with">"Deling med"</string>
+    <string name="abs__shareactionprovider_share_with">"Del med"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Del med %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-nl/abs__strings.xml b/actionbarsherlock-i18n/res/values-nl/abs__strings.xml
new file mode 100755
index 0000000..4588a05
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-nl/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navigeren naar startpositie"</string>
+    <string name="abs__action_bar_up_description">"Omhoog navigeren"</string>
+    <string name="abs__action_menu_overflow_description">"Meer opties"</string>
+    <string name="abs__action_mode_done">"Gereed"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Een activiteit kiezen"</string>
+    <string name="abs__activity_chooser_view_see_all">"Alles weergeven"</string>
+    <string name="abs__activitychooserview_choose_application">"Een app selecteren"</string>
+    <string name="abs__searchview_description_clear">"Zoekopdracht wissen"</string>
+    <string name="abs__searchview_description_query">"Zoekopdracht"</string>
+    <string name="abs__searchview_description_search">"Zoeken"</string>
+    <string name="abs__searchview_description_submit">"Zoekopdracht verzenden"</string>
+    <string name="abs__searchview_description_voice">"Spraakgestuurd zoeken"</string>
+    <string name="abs__share_action_provider_share_with">"Delen met"</string>
+    <string name="abs__shareactionprovider_share_with">"Delen met"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Delen met %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-pl/abs__strings.xml b/actionbarsherlock-i18n/res/values-pl/abs__strings.xml
new file mode 100755
index 0000000..dfaa57c
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-pl/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Przejdź do strony głównej"</string>
+    <string name="abs__action_bar_up_description">"Przejdź wyżej"</string>
+    <string name="abs__action_menu_overflow_description">"Więcej opcji"</string>
+    <string name="abs__action_mode_done">"Gotowe"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Wybierz działanie"</string>
+    <string name="abs__activity_chooser_view_see_all">"Zobacz wszystkie"</string>
+    <string name="abs__activitychooserview_choose_application">"Wybierz aplikację"</string>
+    <string name="abs__searchview_description_clear">"Wyczyść zapytanie"</string>
+    <string name="abs__searchview_description_query">"Wyszukiwane hasło"</string>
+    <string name="abs__searchview_description_search">"Szukaj"</string>
+    <string name="abs__searchview_description_submit">"Wyślij zapytanie"</string>
+    <string name="abs__searchview_description_voice">"Wyszukiwanie głosowe"</string>
+    <string name="abs__share_action_provider_share_with">"Udostępnij przez"</string>
+    <string name="abs__shareactionprovider_share_with">"Udostępnij przez"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Udostępnij przez %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-pt-rBR/abs__strings.xml b/actionbarsherlock-i18n/res/values-pt-rBR/abs__strings.xml
new file mode 100755
index 0000000..32cadfa
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-pt-rBR/abs__strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="abs__action_bar_home_description">Navegar para o início</string>
+  <string name="abs__action_bar_up_description">Navegar até</string>
+  <string name="abs__action_menu_overflow_description">Mais opções</string>
+  <string name="abs__action_mode_done">Feito</string>
+  <string name="abs__activity_chooser_view_see_all">Ver todos…</string>
+  <string name="abs__activitychooserview_choose_application">Escolha um aplicativo</string>
+  <string name="abs__shareactionprovider_share_with">Compartilhe com</string>
+  <string name="abs__shareactionprovider_share_with_application">Compartinhar com </string>
+  <string name="abs__searchview_description_search">Busca</string>
+  <string name="abs__searchview_description_query">Consulta de pesquisa</string>
+  <string name="abs__searchview_description_clear">Limpar Consulta</string>
+  <string name="abs__searchview_description_submit">Enviar consulta</string>
+  <string name="abs__searchview_description_voice">Pesquisa de voz</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-pt-rPT/abs__strings.xml b/actionbarsherlock-i18n/res/values-pt-rPT/abs__strings.xml
new file mode 100755
index 0000000..d9d52d8
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-pt-rPT/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navegar para página inicial"</string>
+    <string name="abs__action_bar_up_description">"Navegar para cima"</string>
+    <string name="abs__action_menu_overflow_description">"Mais opções"</string>
+    <string name="abs__action_mode_done">"Concluído"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Escolher atividade"</string>
+    <string name="abs__activity_chooser_view_see_all">"Ver tudo"</string>
+    <string name="abs__activitychooserview_choose_application">"Escolher uma aplicação"</string>
+    <string name="abs__searchview_description_clear">"Limpar consulta"</string>
+    <string name="abs__searchview_description_query">"Consulta de pesquisa"</string>
+    <string name="abs__searchview_description_search">"Pesquisar"</string>
+    <string name="abs__searchview_description_submit">"Enviar consulta"</string>
+    <string name="abs__searchview_description_voice">"Pesquisa por voz"</string>
+    <string name="abs__share_action_provider_share_with">"Partilhar com"</string>
+    <string name="abs__shareactionprovider_share_with">"Partilhar com:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Compartilhar com %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-pt/abs__strings.xml b/actionbarsherlock-i18n/res/values-pt/abs__strings.xml
new file mode 100755
index 0000000..4675a17
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-pt/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navegar na página inicial"</string>
+    <string name="abs__action_bar_up_description">"Navegar para cima"</string>
+    <string name="abs__action_menu_overflow_description">"Mais opções"</string>
+    <string name="abs__action_mode_done">"Concluído"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Selecione a atividade"</string>
+    <string name="abs__activity_chooser_view_see_all">"Ver tudo"</string>
+    <string name="abs__activitychooserview_choose_application">"Selecione um aplicativo"</string>
+    <string name="abs__searchview_description_clear">"Limpar consulta"</string>
+    <string name="abs__searchview_description_query">"Consulta de pesquisa"</string>
+    <string name="abs__searchview_description_search">"Pesquisar"</string>
+    <string name="abs__searchview_description_submit">"Enviar consulta"</string>
+    <string name="abs__searchview_description_voice">"Pesquisa por voz"</string>
+    <string name="abs__share_action_provider_share_with">"Compartilhar com"</string>
+    <string name="abs__shareactionprovider_share_with">"Compartilhar com"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Compartilhar com %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-ro/abs__strings.xml b/actionbarsherlock-i18n/res/values-ro/abs__strings.xml
new file mode 100755
index 0000000..117632f
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-ro/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Navigaţi la ecranul de pornire"</string>
+    <string name="abs__action_bar_up_description">"Navigaţi în sus"</string>
+    <string name="abs__action_menu_overflow_description">"Mai multe opţiuni"</string>
+    <string name="abs__action_mode_done">"Terminat"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Alegeţi activitatea"</string>
+    <string name="abs__activity_chooser_view_see_all">"Afişaţi-le pe toate"</string>
+    <string name="abs__activitychooserview_choose_application">"Alegeţi o aplicaţie"</string>
+    <string name="abs__searchview_description_clear">"Ştergeţi interogarea"</string>
+    <string name="abs__searchview_description_query">"Interogare de căutare"</string>
+    <string name="abs__searchview_description_search">"Căutaţi"</string>
+    <string name="abs__searchview_description_submit">"Trimiteţi interogarea"</string>
+    <string name="abs__searchview_description_voice">"Căutare vocală"</string>
+    <string name="abs__share_action_provider_share_with">"Distribuiţi pentru"</string>
+    <string name="abs__shareactionprovider_share_with">"Permiteţi accesul pentru"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Permiteţi accesul pentru %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-ru/abs__strings.xml b/actionbarsherlock-i18n/res/values-ru/abs__strings.xml
new file mode 100755
index 0000000..e7c95ec
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-ru/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Перейти на главную"</string>
+    <string name="abs__action_bar_up_description">"Перейти вверх"</string>
+    <string name="abs__action_menu_overflow_description">"Ещё"</string>
+    <string name="abs__action_mode_done">"Готово"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Выберите"</string>
+    <string name="abs__activity_chooser_view_see_all">"Просмотреть все"</string>
+    <string name="abs__activitychooserview_choose_application">"Выберите приложение"</string>
+    <string name="abs__searchview_description_clear">"Удалить запрос"</string>
+    <string name="abs__searchview_description_query">"Поисковый запрос"</string>
+    <string name="abs__searchview_description_search">"Поиск"</string>
+    <string name="abs__searchview_description_submit">"Отправить запрос"</string>
+    <string name="abs__searchview_description_voice">"Голосовой поиск"</string>
+    <string name="abs__share_action_provider_share_with">"Открыть доступ"</string>
+    <string name="abs__shareactionprovider_share_with">"Открыть доступ:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Открыть доступ приложению \"%s\""</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-sk/abs__strings.xml b/actionbarsherlock-i18n/res/values-sk/abs__strings.xml
new file mode 100755
index 0000000..c4f7c20
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-sk/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Prejsť na plochu"</string>
+    <string name="abs__action_bar_up_description">"Prejsť na"</string>
+    <string name="abs__action_menu_overflow_description">"Viac možností"</string>
+    <string name="abs__action_mode_done">"Hotovo"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Vybrať aktivitu"</string>
+    <string name="abs__activity_chooser_view_see_all">"Zobraziť všetky"</string>
+    <string name="abs__activitychooserview_choose_application">"Zvoľte aplikáciu"</string>
+    <string name="abs__searchview_description_clear">"Jasný dopyt"</string>
+    <string name="abs__searchview_description_query">"Vyhľadávací dopyt"</string>
+    <string name="abs__searchview_description_search">"Hľadať"</string>
+    <string name="abs__searchview_description_submit">"Odoslať dopyt"</string>
+    <string name="abs__searchview_description_voice">"Hlasové vyhľadávanie"</string>
+    <string name="abs__share_action_provider_share_with">"Zdieľať s"</string>
+    <string name="abs__shareactionprovider_share_with">"Zdieľať s"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Zdieľať s aplikáciou %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-sl/abs__strings.xml b/actionbarsherlock-i18n/res/values-sl/abs__strings.xml
new file mode 100755
index 0000000..ccc3497
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-sl/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Krmarjenje domov"</string>
+    <string name="abs__action_bar_up_description">"Krmarjenje navzgor"</string>
+    <string name="abs__action_menu_overflow_description">"Več možnosti"</string>
+    <string name="abs__action_mode_done">"Končano"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Izberite dejavnost"</string>
+    <string name="abs__activity_chooser_view_see_all">"Pokaži vse"</string>
+    <string name="abs__activitychooserview_choose_application">"Izberite program"</string>
+    <string name="abs__searchview_description_clear">"Izbris poizvedbe"</string>
+    <string name="abs__searchview_description_query">"Iskalna poizvedba"</string>
+    <string name="abs__searchview_description_search">"Iskanje"</string>
+    <string name="abs__searchview_description_submit">"Pošlji poizvedbo"</string>
+    <string name="abs__searchview_description_voice">"Glasovno iskanje"</string>
+    <string name="abs__share_action_provider_share_with">"Delite z"</string>
+    <string name="abs__shareactionprovider_share_with">"Delite z"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Delite s programom %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-sr/abs__strings.xml b/actionbarsherlock-i18n/res/values-sr/abs__strings.xml
new file mode 100755
index 0000000..34dafa6
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-sr/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Кретање до Почетне"</string>
+    <string name="abs__action_bar_up_description">"Кретање нагоре"</string>
+    <string name="abs__action_menu_overflow_description">"Још опција"</string>
+    <string name="abs__action_mode_done">"Готово"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Избор активности"</string>
+    <string name="abs__activity_chooser_view_see_all">"Прикажи све"</string>
+    <string name="abs__activitychooserview_choose_application">"Изаберите апликацију"</string>
+    <string name="abs__searchview_description_clear">"Обриши упит"</string>
+    <string name="abs__searchview_description_query">"Упит за претрагу"</string>
+    <string name="abs__searchview_description_search">"Претражи"</string>
+    <string name="abs__searchview_description_submit">"Пошаљи упит"</string>
+    <string name="abs__searchview_description_voice">"Гласовна претрага"</string>
+    <string name="abs__share_action_provider_share_with">"Дели са"</string>
+    <string name="abs__shareactionprovider_share_with">"Дели са"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Дели са апликацијом %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-sv/abs__strings.xml b/actionbarsherlock-i18n/res/values-sv/abs__strings.xml
new file mode 100755
index 0000000..3f3b73f
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-sv/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Visa startsidan"</string>
+    <string name="abs__action_bar_up_description">"Navigera uppåt"</string>
+    <string name="abs__action_menu_overflow_description">"Fler alternativ"</string>
+    <string name="abs__action_mode_done">"Klar"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Välj aktivitet"</string>
+    <string name="abs__activity_chooser_view_see_all">"Visa alla"</string>
+    <string name="abs__activitychooserview_choose_application">"Välj en app"</string>
+    <string name="abs__searchview_description_clear">"Ta bort frågan"</string>
+    <string name="abs__searchview_description_query">"Sökfråga"</string>
+    <string name="abs__searchview_description_search">"Sök"</string>
+    <string name="abs__searchview_description_submit">"Skicka fråga"</string>
+    <string name="abs__searchview_description_voice">"Röstsökning"</string>
+    <string name="abs__share_action_provider_share_with">"Dela med"</string>
+    <string name="abs__shareactionprovider_share_with">"Dela med"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Dela med %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-sw/abs__strings.xml b/actionbarsherlock-i18n/res/values-sw/abs__strings.xml
new file mode 100755
index 0000000..91f056f
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-sw/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Abiri nyumbani"</string>
+    <string name="abs__action_bar_up_description">"Ongoza"</string>
+    <string name="abs__action_menu_overflow_description">"Chaguo zaidi"</string>
+    <string name="abs__action_mode_done">"Kwisha"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Chagua shughuli"</string>
+    <string name="abs__activity_chooser_view_see_all">"Angalia zote"</string>
+    <string name="abs__activitychooserview_choose_application">"Chagua programu"</string>
+    <string name="abs__searchview_description_clear">"Futa swali"</string>
+    <string name="abs__searchview_description_query">"Hoja ya utafutaji"</string>
+    <string name="abs__searchview_description_search">"Tafuta"</string>
+    <string name="abs__searchview_description_submit">"Wasilisha hoja"</string>
+    <string name="abs__searchview_description_voice">"Utafutaji wa sauti"</string>
+    <string name="abs__share_action_provider_share_with">"Shiriki na"</string>
+    <string name="abs__shareactionprovider_share_with">"Gawa na"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Gawa na %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-th/abs__strings.xml b/actionbarsherlock-i18n/res/values-th/abs__strings.xml
new file mode 100755
index 0000000..7c8c38c
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-th/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"นำทางไปหน้าแรก"</string>
+    <string name="abs__action_bar_up_description">"นำทางขึ้น"</string>
+    <string name="abs__action_menu_overflow_description">"ตัวเลือกเพิ่มเติม"</string>
+    <string name="abs__action_mode_done">"เสร็จสิ้น"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"เลือกกิจกรรม"</string>
+    <string name="abs__activity_chooser_view_see_all">"ดูทั้งหมด"</string>
+    <string name="abs__activitychooserview_choose_application">"เลือกแอปพลิเคชัน"</string>
+    <string name="abs__searchview_description_clear">"ล้างข้อความค้นหา"</string>
+    <string name="abs__searchview_description_query">"คำค้นหา"</string>
+    <string name="abs__searchview_description_search">"ค้นหา"</string>
+    <string name="abs__searchview_description_submit">"ส่งข้อความค้นหา"</string>
+    <string name="abs__searchview_description_voice">"ค้นหาด้วยเสียง"</string>
+    <string name="abs__share_action_provider_share_with">"แบ่งปันกับ"</string>
+    <string name="abs__shareactionprovider_share_with">"แบ่งปันกับ"</string>
+    <string name="abs__shareactionprovider_share_with_application">"แบ่งปันด้วย %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-tl/abs__strings.xml b/actionbarsherlock-i18n/res/values-tl/abs__strings.xml
new file mode 100755
index 0000000..0aed35e
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-tl/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Magnabiga sa home"</string>
+    <string name="abs__action_bar_up_description">"Magnabiga pataas"</string>
+    <string name="abs__action_menu_overflow_description">"Higit pang mga pagpipilian"</string>
+    <string name="abs__action_mode_done">"Tapos na"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Pumili ng aktibidad"</string>
+    <string name="abs__activity_chooser_view_see_all">"Tingnan lahat"</string>
+    <string name="abs__activitychooserview_choose_application">"Pumili ng isang app"</string>
+    <string name="abs__searchview_description_clear">"I-clear ang query"</string>
+    <string name="abs__searchview_description_query">"Query sa paghahanap"</string>
+    <string name="abs__searchview_description_search">"Paghahanap"</string>
+    <string name="abs__searchview_description_submit">"Isumite ang query"</string>
+    <string name="abs__searchview_description_voice">"Paghahanap gamit ang boses"</string>
+    <string name="abs__share_action_provider_share_with">"Ibahagi sa"</string>
+    <string name="abs__shareactionprovider_share_with">"Ibahagi sa"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Ibahagi sa %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-tr/abs__strings.xml b/actionbarsherlock-i18n/res/values-tr/abs__strings.xml
new file mode 100755
index 0000000..c5b8897
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-tr/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Ana sayfaya git"</string>
+    <string name="abs__action_bar_up_description">"Yukarı git"</string>
+    <string name="abs__action_menu_overflow_description">"Diğer seçenekler"</string>
+    <string name="abs__action_mode_done">"Bitti"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Etkinlik seçin"</string>
+    <string name="abs__activity_chooser_view_see_all">"Tümünü göster"</string>
+    <string name="abs__activitychooserview_choose_application">"Bir uygulama seçin"</string>
+    <string name="abs__searchview_description_clear">"Sorguyu temizle"</string>
+    <string name="abs__searchview_description_query">"Arama sorgusu"</string>
+    <string name="abs__searchview_description_search">"Ara"</string>
+    <string name="abs__searchview_description_submit">"Sorguyu gönder"</string>
+    <string name="abs__searchview_description_voice">"Sesli arama"</string>
+    <string name="abs__share_action_provider_share_with">"Şununla paylaş:"</string>
+    <string name="abs__shareactionprovider_share_with">"Şununla paylaş:"</string>
+    <string name="abs__shareactionprovider_share_with_application">"%s ile paylaş"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-uk/abs__strings.xml b/actionbarsherlock-i18n/res/values-uk/abs__strings.xml
new file mode 100755
index 0000000..4e7d5e4
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-uk/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Перейти на головну"</string>
+    <string name="abs__action_bar_up_description">"Перейти вгору"</string>
+    <string name="abs__action_menu_overflow_description">"Інші варіанти"</string>
+    <string name="abs__action_mode_done">"Готово"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Вибрати дію"</string>
+    <string name="abs__activity_chooser_view_see_all">"Переглянути всі"</string>
+    <string name="abs__activitychooserview_choose_application">"Вибрати програму"</string>
+    <string name="abs__searchview_description_clear">"Очистити запит"</string>
+    <string name="abs__searchview_description_query">"Пошуковий запит"</string>
+    <string name="abs__searchview_description_search">"Пошук"</string>
+    <string name="abs__searchview_description_submit">"Наіслати запит"</string>
+    <string name="abs__searchview_description_voice">"Голосовий пошук"</string>
+    <string name="abs__share_action_provider_share_with">"Спільний доступ для:"</string>
+    <string name="abs__shareactionprovider_share_with">"Надіслати через"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Надіслати через %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-vi/abs__strings.xml b/actionbarsherlock-i18n/res/values-vi/abs__strings.xml
new file mode 100755
index 0000000..f5e919d
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-vi/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Điều hướng về trang chủ"</string>
+    <string name="abs__action_bar_up_description">"Điều hướng lên trên"</string>
+    <string name="abs__action_menu_overflow_description">"Tùy chọn khác"</string>
+    <string name="abs__action_mode_done">"Xong"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Chọn hoạt động"</string>
+    <string name="abs__activity_chooser_view_see_all">"Xem tất cả"</string>
+    <string name="abs__activitychooserview_choose_application">"Chọn một ứng dụng"</string>
+    <string name="abs__searchview_description_clear">"Xóa truy vấn"</string>
+    <string name="abs__searchview_description_query">"Truy vấn tìm kiếm"</string>
+    <string name="abs__searchview_description_search">"Tìm kiếm"</string>
+    <string name="abs__searchview_description_submit">"Gửi truy vấn"</string>
+    <string name="abs__searchview_description_voice">"Tìm kiếm bằng giọng nói"</string>
+    <string name="abs__share_action_provider_share_with">"Chia sẻ với"</string>
+    <string name="abs__shareactionprovider_share_with">"Chia sẻ với"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Chia sẻ với %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-zh-rCN/abs__strings.xml b/actionbarsherlock-i18n/res/values-zh-rCN/abs__strings.xml
new file mode 100755
index 0000000..1d6f801
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-zh-rCN/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"导航首页"</string>
+    <string name="abs__action_bar_up_description">"向上导航"</string>
+    <string name="abs__action_menu_overflow_description">"更多选项"</string>
+    <string name="abs__action_mode_done">"完成"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"选择活动"</string>
+    <string name="abs__activity_chooser_view_see_all">"查看全部"</string>
+    <string name="abs__activitychooserview_choose_application">"选择应用"</string>
+    <string name="abs__searchview_description_clear">"清除查询"</string>
+    <string name="abs__searchview_description_query">"搜索查询"</string>
+    <string name="abs__searchview_description_search">"搜索"</string>
+    <string name="abs__searchview_description_submit">"提交查询"</string>
+    <string name="abs__searchview_description_voice">"语音搜索"</string>
+    <string name="abs__share_action_provider_share_with">"分享对象"</string>
+    <string name="abs__shareactionprovider_share_with">"共享对象"</string>
+    <string name="abs__shareactionprovider_share_with_application">"与“%s”共享"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-zh-rTW/abs__strings.xml b/actionbarsherlock-i18n/res/values-zh-rTW/abs__strings.xml
new file mode 100755
index 0000000..e26ea9c
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-zh-rTW/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"瀏覽首頁"</string>
+    <string name="abs__action_bar_up_description">"向上瀏覽"</string>
+    <string name="abs__action_menu_overflow_description">"更多選項"</string>
+    <string name="abs__action_mode_done">"完成"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"選擇活動"</string>
+    <string name="abs__activity_chooser_view_see_all">"全部顯示"</string>
+    <string name="abs__activitychooserview_choose_application">"選擇應用程式"</string>
+    <string name="abs__searchview_description_clear">"清除查詢"</string>
+    <string name="abs__searchview_description_query">"搜尋查詢"</string>
+    <string name="abs__searchview_description_search">"搜尋"</string>
+    <string name="abs__searchview_description_submit">"提交查詢"</string>
+    <string name="abs__searchview_description_voice">"語音搜尋"</string>
+    <string name="abs__share_action_provider_share_with">"分享活動"</string>
+    <string name="abs__shareactionprovider_share_with">"分享對象："</string>
+    <string name="abs__shareactionprovider_share_with_application">"與「%s」分享"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/res/values-zu/abs__strings.xml b/actionbarsherlock-i18n/res/values-zu/abs__strings.xml
new file mode 100755
index 0000000..7ba5140
--- /dev/null
+++ b/actionbarsherlock-i18n/res/values-zu/abs__strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><resources>
+    <string name="abs__action_bar_home_description">"Zulazulela ekhaya"</string>
+    <string name="abs__action_bar_up_description">"Zulazulela phezulu"</string>
+    <string name="abs__action_menu_overflow_description">"Izinketho ezingaphezulu"</string>
+    <string name="abs__action_mode_done">"Kwenziwe"</string>
+    <string name="abs__activity_chooser_view_dialog_title_default">"Khetha okwenziwayo"</string>
+    <string name="abs__activity_chooser_view_see_all">"Buka konke"</string>
+    <string name="abs__activitychooserview_choose_application">"Khetha insiza"</string>
+    <string name="abs__searchview_description_clear">"xazulula umbuzo"</string>
+    <string name="abs__searchview_description_query">"Umbuzo wosesho"</string>
+    <string name="abs__searchview_description_search">"Sesha"</string>
+    <string name="abs__searchview_description_submit">"Thumela umbuzo"</string>
+    <string name="abs__searchview_description_voice">"Ukusesha ngezwi"</string>
+    <string name="abs__share_action_provider_share_with">"Yabelana no"</string>
+    <string name="abs__shareactionprovider_share_with">"Yabelana no"</string>
+    <string name="abs__shareactionprovider_share_with_application">"Yabelana no %s"</string>
+</resources>
diff --git a/actionbarsherlock-i18n/src/.gitignore b/actionbarsherlock-i18n/src/.gitignore
new file mode 100755
index 0000000..e69de29
--- /dev/null
+++ b/actionbarsherlock-i18n/src/.gitignore
diff --git a/actionbarsherlock-i18n/strings.json b/actionbarsherlock-i18n/strings.json
new file mode 100755
index 0000000..218ae1d
--- /dev/null
+++ b/actionbarsherlock-i18n/strings.json
@@ -0,0 +1,22 @@
+{
+    "grab": [
+        "action_bar_home_description", 
+        "action_bar_up_description", 
+        "action_menu_overflow_description", 
+        "action_mode_done", 
+        "activity_chooser_view_see_all", 
+        "activity_chooser_view_dialog_title_default", 
+        "share_action_provider_share_with", 
+        "activitychooserview_choose_application", 
+        "shareactionprovider_share_with", 
+        "shareactionprovider_share_with_application", 
+        "searchview_description_search", 
+        "searchview_description_query", 
+        "searchview_description_clear", 
+        "searchview_description_submit", 
+        "searchview_description_voice"
+    ],
+    "prefix": "abs__",
+    "filename_pattern": "abs__%s.xml",
+    "ignore_default_locale": true
+}
diff --git a/samples/README.md b/actionbarsherlock-samples/README.md
index 2c461e8..2c461e8 100644..100755
--- a/samples/README.md
+++ b/actionbarsherlock-samples/README.md
diff --git a/samples/demos/AndroidManifest.xml b/actionbarsherlock-samples/demos/AndroidManifest.xml
index 0d489ed..6546bde 100644..100755
--- a/samples/demos/AndroidManifest.xml
+++ b/actionbarsherlock-samples/demos/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock.sample.demos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.demos">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
@@ -65,13 +65,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:label="@string/dialog" android:name=".Dialog" android:theme="@style/Theme.Sherlock.Dialog">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="com.actionbarsherlock.sample.demos.EXAMPLE"/>
-            </intent-filter>
-        </activity>
-
         <activity android:label="@string/feature_toggles" android:name=".FeatureToggles">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -79,42 +72,42 @@
             </intent-filter>
         </activity>
 
-        <activity android:label="@string/forced_overflow" android:name=".ForcedOverflowItem">
+        <activity android:label="@string/iprogress" android:name=".IndeterminateProgress">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="com.actionbarsherlock.sample.demos.EXAMPLE"/>
             </intent-filter>
         </activity>
 
-        <activity android:label="@string/iprogress" android:name=".IndeterminateProgress">
+        <activity android:label="@string/list_navigation" android:name=".ListNavigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="com.actionbarsherlock.sample.demos.EXAMPLE"/>
             </intent-filter>
         </activity>
 
-        <activity android:label="@string/list_navigation" android:name=".ListNavigation">
+        <activity android:label="@string/overlay" android:name=".Overlay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="com.actionbarsherlock.sample.demos.EXAMPLE"/>
             </intent-filter>
         </activity>
 
-        <activity android:label="@string/overlay" android:name=".Overlay">
+        <activity android:label="@string/preference" android:name=".Preference">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="com.actionbarsherlock.sample.demos.EXAMPLE"/>
             </intent-filter>
         </activity>
 
-        <activity android:label="@string/preference" android:name=".Preference">
+        <activity android:label="@string/progress" android:name=".Progress">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="com.actionbarsherlock.sample.demos.EXAMPLE"/>
             </intent-filter>
         </activity>
 
-        <activity android:label="@string/progress" android:name=".Progress">
+        <activity android:label="@string/search_views" android:name=".SearchViews">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="com.actionbarsherlock.sample.demos.EXAMPLE"/>
diff --git a/samples/demos/README.md b/actionbarsherlock-samples/demos/README.md
index a0198bf..a0198bf 100644..100755
--- a/samples/demos/README.md
+++ b/actionbarsherlock-samples/demos/README.md
diff --git a/library/libs/android-support-v4.jar b/actionbarsherlock-samples/demos/libs/android-support-v4.jar
index 99e063b..99e063b 100644..100755
--- a/library/libs/android-support-v4.jar
+++ b/actionbarsherlock-samples/demos/libs/android-support-v4.jar
diff --git a/actionbarsherlock-samples/demos/pom.xml b/actionbarsherlock-samples/demos/pom.xml
new file mode 100755
index 0000000..3cf24c6
--- /dev/null
+++ b/actionbarsherlock-samples/demos/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent-sample</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>sample-demos</artifactId>
+  <name>Sample: Demos</name>
+  <packaging>apk</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>actionbarsherlock</artifactId>
+      <version>${project.version}</version>
+      <type>apklib</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/styled/project.properties b/actionbarsherlock-samples/demos/project.properties
index 9491978..2eb2ae3 100644..100755
--- a/samples/styled/project.properties
+++ b/actionbarsherlock-samples/demos/project.properties
@@ -9,7 +9,10 @@
 
 # Project target.
 target=android-14
-android.library.reference.1=../../library
+android.library.reference.1=../../actionbarsherlock
+
+
+
 
 
 
diff --git a/samples/demos/res/drawable-hdpi/bg_striped_img.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/bg_striped_img.png
index ab8487a..ab8487a 100644..100755
--- a/samples/demos/res/drawable-hdpi/bg_striped_img.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/bg_striped_img.png
diff --git a/samples/demos/res/drawable-hdpi/bg_striped_split_img.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/bg_striped_split_img.png
index 4c780ea..4c780ea 100644..100755
--- a/samples/demos/res/drawable-hdpi/bg_striped_split_img.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/bg_striped_split_img.png
diff --git a/samples/demos/res/drawable-hdpi/ic_compose.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_compose.png
index cdb09e4..cdb09e4 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_compose.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_compose.png
diff --git a/samples/demos/res/drawable-hdpi/ic_compose_inverse.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_compose_inverse.png
index 8a0c487..8a0c487 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_compose_inverse.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_compose_inverse.png
diff --git a/samples/demos/res/drawable-hdpi/ic_launcher_settings.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_launcher_settings.png
index c02bd42..c02bd42 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_launcher_settings.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_launcher_settings.png
diff --git a/samples/demos/res/drawable-hdpi/ic_magnifying_glass.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_magnifying_glass.png
index cdf3518..cdf3518 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_magnifying_glass.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_magnifying_glass.png
diff --git a/samples/demos/res/drawable-hdpi/ic_refresh.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_refresh.png
index 08c32e0..08c32e0 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_refresh.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_refresh.png
diff --git a/samples/demos/res/drawable-hdpi/ic_refresh_inverse.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_refresh_inverse.png
index 9ab1d38..9ab1d38 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_refresh_inverse.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_refresh_inverse.png
diff --git a/samples/demos/res/drawable-hdpi/ic_search.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_search.png
index 59de344..59de344 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_search.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_search.png
diff --git a/samples/demos/res/drawable-hdpi/ic_search_inverse.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_search_inverse.png
index eb090a6..eb090a6 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_search_inverse.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_search_inverse.png
diff --git a/samples/demos/res/drawable-hdpi/ic_title_share_default.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_title_share_default.png
index ee4b285..ee4b285 100644..100755
--- a/samples/demos/res/drawable-hdpi/ic_title_share_default.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/ic_title_share_default.png
diff --git a/samples/demos/res/drawable-hdpi/icon.png b/actionbarsherlock-samples/demos/res/drawable-hdpi/icon.png
index 723fbf0..723fbf0 100644..100755
--- a/samples/demos/res/drawable-hdpi/icon.png
+++ b/actionbarsherlock-samples/demos/res/drawable-hdpi/icon.png
diff --git a/samples/demos/res/drawable-ldpi/icon.png b/actionbarsherlock-samples/demos/res/drawable-ldpi/icon.png
index 181f679..181f679 100644..100755
--- a/samples/demos/res/drawable-ldpi/icon.png
+++ b/actionbarsherlock-samples/demos/res/drawable-ldpi/icon.png
diff --git a/samples/demos/res/drawable-mdpi/bg_striped_img.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/bg_striped_img.png
index 06e3ebd..06e3ebd 100644..100755
--- a/samples/demos/res/drawable-mdpi/bg_striped_img.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/bg_striped_img.png
diff --git a/samples/demos/res/drawable-mdpi/bg_striped_split_img.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/bg_striped_split_img.png
index 1308ade..1308ade 100644..100755
--- a/samples/demos/res/drawable-mdpi/bg_striped_split_img.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/bg_striped_split_img.png
diff --git a/samples/demos/res/drawable-mdpi/ic_compose.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_compose.png
index 15a4130..15a4130 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_compose.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_compose.png
diff --git a/samples/demos/res/drawable-mdpi/ic_compose_inverse.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_compose_inverse.png
index de58ce8..de58ce8 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_compose_inverse.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_compose_inverse.png
diff --git a/samples/demos/res/drawable-mdpi/ic_launcher_settings.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_launcher_settings.png
index 05cdd9a..05cdd9a 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_launcher_settings.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_launcher_settings.png
diff --git a/samples/demos/res/drawable-mdpi/ic_magnifying_glass.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_magnifying_glass.png
index 53aa6d9..53aa6d9 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_magnifying_glass.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_magnifying_glass.png
diff --git a/samples/demos/res/drawable-mdpi/ic_refresh.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_refresh.png
index 55c43c3..55c43c3 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_refresh.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_refresh.png
diff --git a/samples/demos/res/drawable-mdpi/ic_refresh_inverse.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_refresh_inverse.png
index d5736ec..d5736ec 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_refresh_inverse.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_refresh_inverse.png
diff --git a/samples/demos/res/drawable-mdpi/ic_search.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_search.png
index 75339d9..75339d9 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_search.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_search.png
diff --git a/samples/demos/res/drawable-mdpi/ic_search_inverse.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_search_inverse.png
index b462c32..b462c32 100644..100755
--- a/samples/demos/res/drawable-mdpi/ic_search_inverse.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/ic_search_inverse.png
diff --git a/samples/demos/res/drawable-mdpi/icon.png b/actionbarsherlock-samples/demos/res/drawable-mdpi/icon.png
index 79f50d8..79f50d8 100644..100755
--- a/samples/demos/res/drawable-mdpi/icon.png
+++ b/actionbarsherlock-samples/demos/res/drawable-mdpi/icon.png
diff --git a/samples/demos/res/drawable-xhdpi/bg_striped_img.png b/actionbarsherlock-samples/demos/res/drawable-xhdpi/bg_striped_img.png
index 92f3fa1..92f3fa1 100644..100755
--- a/samples/demos/res/drawable-xhdpi/bg_striped_img.png
+++ b/actionbarsherlock-samples/demos/res/drawable-xhdpi/bg_striped_img.png
diff --git a/samples/demos/res/drawable-xhdpi/bg_striped_split_img.png b/actionbarsherlock-samples/demos/res/drawable-xhdpi/bg_striped_split_img.png
index e31f4a6..e31f4a6 100644..100755
--- a/samples/demos/res/drawable-xhdpi/bg_striped_split_img.png
+++ b/actionbarsherlock-samples/demos/res/drawable-xhdpi/bg_striped_split_img.png
diff --git a/samples/demos/res/drawable-xhdpi/ic_launcher_settings.png b/actionbarsherlock-samples/demos/res/drawable-xhdpi/ic_launcher_settings.png
index 2b2907b..2b2907b 100644..100755
--- a/samples/demos/res/drawable-xhdpi/ic_launcher_settings.png
+++ b/actionbarsherlock-samples/demos/res/drawable-xhdpi/ic_launcher_settings.png
diff --git a/samples/demos/res/drawable-xhdpi/icon.png b/actionbarsherlock-samples/demos/res/drawable-xhdpi/icon.png
index 34ca9a4..34ca9a4 100644..100755
--- a/samples/demos/res/drawable-xhdpi/icon.png
+++ b/actionbarsherlock-samples/demos/res/drawable-xhdpi/icon.png
diff --git a/samples/demos/res/drawable/bg_striped.xml b/actionbarsherlock-samples/demos/res/drawable/bg_striped.xml
index 77e0aab..77e0aab 100644..100755
--- a/samples/demos/res/drawable/bg_striped.xml
+++ b/actionbarsherlock-samples/demos/res/drawable/bg_striped.xml
diff --git a/samples/demos/res/drawable/bg_striped_split.xml b/actionbarsherlock-samples/demos/res/drawable/bg_striped_split.xml
index 9b0e313..9b0e313 100644..100755
--- a/samples/demos/res/drawable/bg_striped_split.xml
+++ b/actionbarsherlock-samples/demos/res/drawable/bg_striped_split.xml
diff --git a/samples/demos/res/layout-large-land/feature_toggles.xml b/actionbarsherlock-samples/demos/res/layout-large-land/feature_toggles.xml
index 359f298..359f298 100644..100755
--- a/samples/demos/res/layout-large-land/feature_toggles.xml
+++ b/actionbarsherlock-samples/demos/res/layout-large-land/feature_toggles.xml
diff --git a/samples/demos/res/layout/action_modes.xml b/actionbarsherlock-samples/demos/res/layout/action_modes.xml
index dd9b0c4..dd9b0c4 100644..100755
--- a/samples/demos/res/layout/action_modes.xml
+++ b/actionbarsherlock-samples/demos/res/layout/action_modes.xml
diff --git a/samples/demos/res/layout/collapsible_edittext.xml b/actionbarsherlock-samples/demos/res/layout/collapsible_edittext.xml
index d1bd064..d1bd064 100644..100755
--- a/samples/demos/res/layout/collapsible_edittext.xml
+++ b/actionbarsherlock-samples/demos/res/layout/collapsible_edittext.xml
diff --git a/samples/demos/res/layout/context_menus.xml b/actionbarsherlock-samples/demos/res/layout/context_menus.xml
index e5d796e..e5d796e 100644..100755
--- a/samples/demos/res/layout/context_menus.xml
+++ b/actionbarsherlock-samples/demos/res/layout/context_menus.xml
diff --git a/samples/demos/res/layout/custom_view.xml b/actionbarsherlock-samples/demos/res/layout/custom_view.xml
index 43a8a0c..43a8a0c 100644..100755
--- a/samples/demos/res/layout/custom_view.xml
+++ b/actionbarsherlock-samples/demos/res/layout/custom_view.xml
diff --git a/samples/demos/res/layout/feature_toggles.xml b/actionbarsherlock-samples/demos/res/layout/feature_toggles.xml
index 7d0f796..7d0f796 100644..100755
--- a/samples/demos/res/layout/feature_toggles.xml
+++ b/actionbarsherlock-samples/demos/res/layout/feature_toggles.xml
diff --git a/samples/demos/res/layout/iprogress.xml b/actionbarsherlock-samples/demos/res/layout/iprogress.xml
index 5f1ca7d..5f1ca7d 100644..100755
--- a/samples/demos/res/layout/iprogress.xml
+++ b/actionbarsherlock-samples/demos/res/layout/iprogress.xml
diff --git a/samples/demos/res/layout/list_navigation.xml b/actionbarsherlock-samples/demos/res/layout/list_navigation.xml
index 55254ae..55254ae 100644..100755
--- a/samples/demos/res/layout/list_navigation.xml
+++ b/actionbarsherlock-samples/demos/res/layout/list_navigation.xml
diff --git a/samples/demos/res/layout/overlay.xml b/actionbarsherlock-samples/demos/res/layout/overlay.xml
index adc4565..adc4565 100644..100755
--- a/samples/demos/res/layout/overlay.xml
+++ b/actionbarsherlock-samples/demos/res/layout/overlay.xml
diff --git a/samples/demos/res/layout/preferences.xml b/actionbarsherlock-samples/demos/res/layout/preferences.xml
index d2e1e83..d2e1e83 100644..100755
--- a/samples/demos/res/layout/preferences.xml
+++ b/actionbarsherlock-samples/demos/res/layout/preferences.xml
diff --git a/samples/demos/res/layout/progress.xml b/actionbarsherlock-samples/demos/res/layout/progress.xml
index fe47c61..fe47c61 100644..100755
--- a/samples/demos/res/layout/progress.xml
+++ b/actionbarsherlock-samples/demos/res/layout/progress.xml
diff --git a/samples/demos/res/layout/settings_action_provider.xml b/actionbarsherlock-samples/demos/res/layout/settings_action_provider.xml
index 969332a..969332a 100644..100755
--- a/samples/demos/res/layout/settings_action_provider.xml
+++ b/actionbarsherlock-samples/demos/res/layout/settings_action_provider.xml
diff --git a/samples/demos/res/layout/tab_custom_view.xml b/actionbarsherlock-samples/demos/res/layout/tab_custom_view.xml
index a091411..a091411 100644..100755
--- a/samples/demos/res/layout/tab_custom_view.xml
+++ b/actionbarsherlock-samples/demos/res/layout/tab_custom_view.xml
diff --git a/samples/demos/res/layout/tab_navigation.xml b/actionbarsherlock-samples/demos/res/layout/tab_navigation.xml
index 7b7f989..7b7f989 100644..100755
--- a/samples/demos/res/layout/tab_navigation.xml
+++ b/actionbarsherlock-samples/demos/res/layout/tab_navigation.xml
diff --git a/samples/demos/res/layout/text.xml b/actionbarsherlock-samples/demos/res/layout/text.xml
index 77dcd21..77dcd21 100644..100755
--- a/samples/demos/res/layout/text.xml
+++ b/actionbarsherlock-samples/demos/res/layout/text.xml
diff --git a/samples/demos/res/menu/settings_action_provider.xml b/actionbarsherlock-samples/demos/res/menu/settings_action_provider.xml
index 0a9b0ce..0a9b0ce 100644..100755
--- a/samples/demos/res/menu/settings_action_provider.xml
+++ b/actionbarsherlock-samples/demos/res/menu/settings_action_provider.xml
diff --git a/samples/demos/res/menu/share_action_provider.xml b/actionbarsherlock-samples/demos/res/menu/share_action_provider.xml
index 6b05235..6b05235 100644..100755
--- a/samples/demos/res/menu/share_action_provider.xml
+++ b/actionbarsherlock-samples/demos/res/menu/share_action_provider.xml
diff --git a/samples/demos/res/raw/robot.png b/actionbarsherlock-samples/demos/res/raw/robot.png
index 8a9e698..8a9e698 100644..100755
--- a/samples/demos/res/raw/robot.png
+++ b/actionbarsherlock-samples/demos/res/raw/robot.png
diff --git a/samples/demos/res/values/arrays.xml b/actionbarsherlock-samples/demos/res/values/arrays.xml
index 19eb537..19eb537 100644..100755
--- a/samples/demos/res/values/arrays.xml
+++ b/actionbarsherlock-samples/demos/res/values/arrays.xml
diff --git a/samples/demos/res/values/colors.xml b/actionbarsherlock-samples/demos/res/values/colors.xml
index 2e2ad74..2e2ad74 100644..100755
--- a/samples/demos/res/values/colors.xml
+++ b/actionbarsherlock-samples/demos/res/values/colors.xml
diff --git a/samples/demos/res/values/strings.xml b/actionbarsherlock-samples/demos/res/values/strings.xml
index 610235a..ea62e23 100644..100755
--- a/samples/demos/res/values/strings.xml
+++ b/actionbarsherlock-samples/demos/res/values/strings.xml
@@ -21,7 +21,7 @@
     <string name="action_providers_content">This activity demonstrates how to implement an ActionProvider for adding functionality to the Action Bar. In particular this demo creates an ActionProvider for launching the system settings and adds a menu item with that provider.</string>
 
     <string name="collapsible">Collapsible Action Items</string>
-    <string name="collapsible_content">This activity is a demonstration of how collapsible action items work. When you are concerned about the available room for items on small screens you should use this feature.</string>
+    <string name="collapsible_content">This activity is a demonstration of how collapsible action items work. When you are concerned about the available room for items on small screens you should use this feature.\n\nIf you are looking for a proper SearchView implementation, see this "Search Views" example.</string>
 
     <string name="context_menus">Context Menus</string>
     <string name="context_menus_content">Since both ActionBarSherlock and Android use \'Menu\' and \'MenuItem\' class names you must take extra care when using context menus. It is still very much possible to use both in a single activity.</string>
@@ -35,9 +35,6 @@
     <string name="feature_toggles">Feature Toggles</string>
     <string name="feature_toggles_content">Use these buttons to create various configurations with the action bar to see how it behaves.</string>
 
-    <string name="forced_overflow">Forced Overflow Item</string>
-    <string name="forced_overflow_content">If you choose, you can force the presence of the overflow menu as an action item. Google\'s own research indicates that the regular options menu is lost on most users and doing this will place it always on screen. You can use a theme ending in `ForceOverflow` or add the `absForceOverflow` attribute to a custom theme.\n\nNote: This will only work on the pre-ICS action bar.</string>
-
     <string name="iprogress">Indeterminate Progress</string>
     <string name="iprogress_content">The action bar includes a standard indeterminate progress bar. The methods for accessing it are prefixed with `support`. See the source for this demo for more information.</string>
 
@@ -53,6 +50,9 @@
     <string name="progress">Progress</string>
     <string name="progress_content">The action bar includes a standard progress bar. The methods for accessing it are prefixed with `support`. See the source for this demo for more information.</string>
 
+    <string name="search_views">Search Views</string>
+    <string name="search_views_content">SearchView allows you provide a unified mechanism of searching with optional featurs such as auto-completion and an always-expanded mode.</string>
+
     <string name="simple">Simple</string>
     <string name="simple_content">This is a simple showcase of how easy it is to add the action bar to your activities. Take a look at the source code, it\'s surprisingly simple!</string>
 
@@ -77,7 +77,7 @@
 
 
 
-    <string name="action_bar_share_with">Share with...</string>
+    <string name="action_bar_share_with">Share with…</string>
 
 
 
diff --git a/samples/demos/res/values/themes.xml b/actionbarsherlock-samples/demos/res/values/themes.xml
index 032bb48..032bb48 100644..100755
--- a/samples/demos/res/values/themes.xml
+++ b/actionbarsherlock-samples/demos/res/values/themes.xml
diff --git a/samples/demos/res/xml/preferences.xml b/actionbarsherlock-samples/demos/res/xml/preferences.xml
index 98084f3..98084f3 100644..100755
--- a/samples/demos/res/xml/preferences.xml
+++ b/actionbarsherlock-samples/demos/res/xml/preferences.xml
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionItems.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionItems.java
index 593a232..593a232 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionItems.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionItems.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionModes.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionModes.java
index 58a01e7..58a01e7 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionModes.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionModes.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionModesNoActionBar.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionModesNoActionBar.java
index 23c7a3b..23c7a3b 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionModesNoActionBar.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionModesNoActionBar.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionProviders.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionProviders.java
index d7de2d8..d7de2d8 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ActionProviders.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ActionProviders.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/CollapsibleActionItem.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/CollapsibleActionItem.java
index 116545e..116545e 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/CollapsibleActionItem.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/CollapsibleActionItem.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ContextMenus.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ContextMenus.java
index 3f08bfe..3f08bfe 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ContextMenus.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ContextMenus.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/CustomNavigation.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/CustomNavigation.java
index f9696fc..f9696fc 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/CustomNavigation.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/CustomNavigation.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/FeatureToggles.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/FeatureToggles.java
index c9b99b9..c9b99b9 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/FeatureToggles.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/FeatureToggles.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/IndeterminateProgress.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/IndeterminateProgress.java
index 5d10d28..5d10d28 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/IndeterminateProgress.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/IndeterminateProgress.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ListNavigation.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ListNavigation.java
index e529de3..e529de3 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ListNavigation.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ListNavigation.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/Overlay.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Overlay.java
index 4bb37ea..4bb37ea 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/Overlay.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Overlay.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/Preference.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Preference.java
index 27cfc7d..27cfc7d 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/Preference.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Preference.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/Progress.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Progress.java
index f6b4b88..f6b4b88 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/Progress.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Progress.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/SampleList.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SampleList.java
index 38ef4c0..38ef4c0 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/SampleList.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SampleList.java
diff --git a/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SearchViews.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SearchViews.java
new file mode 100755
index 0000000..06a37f4
--- /dev/null
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SearchViews.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2011 Jake Wharton
+ *
+ * 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.
+ */
+package com.actionbarsherlock.sample.demos;
+
+import android.app.SearchManager;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.os.Bundle;
+import android.provider.BaseColumns;
+import android.support.v4.widget.CursorAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.actionbarsherlock.app.SherlockActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.widget.SearchView;
+
+public class SearchViews extends SherlockActivity implements SearchView.OnQueryTextListener,
+        SearchView.OnSuggestionListener {
+
+    private static final String[] COLUMNS = {
+            BaseColumns._ID,
+            SearchManager.SUGGEST_COLUMN_TEXT_1,
+    };
+
+    private SuggestionsAdapter mSuggestionsAdapter;
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        //Used to put dark icons on light action bar
+        boolean isLight = SampleList.THEME == R.style.Theme_Sherlock_Light;
+
+        //Create the search view
+        SearchView searchView = new SearchView(getSupportActionBar().getThemedContext());
+        searchView.setQueryHint("Search for countries…");
+        searchView.setOnQueryTextListener(this);
+        searchView.setOnSuggestionListener(this);
+
+        if (mSuggestionsAdapter == null) {
+            MatrixCursor cursor = new MatrixCursor(COLUMNS);
+            cursor.addRow(new String[]{"1", "'Murica"});
+            cursor.addRow(new String[]{"2", "Canada"});
+            cursor.addRow(new String[]{"3", "Denmark"});
+            mSuggestionsAdapter = new SuggestionsAdapter(getSupportActionBar().getThemedContext(), cursor);
+        }
+
+        searchView.setSuggestionsAdapter(mSuggestionsAdapter);
+
+        menu.add("Search")
+            .setIcon(isLight ? R.drawable.ic_search_inverse : R.drawable.abs__ic_search)
+            .setActionView(searchView)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
+
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        setTheme(SampleList.THEME); //Used for theme switching in samples
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.text);
+        ((TextView)findViewById(R.id.text)).setText(R.string.search_views_content);
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(String query) {
+        Toast.makeText(this, "You searched for: " + query, Toast.LENGTH_LONG).show();
+        return true;
+    }
+
+    @Override
+    public boolean onQueryTextChange(String newText) {
+        return false;
+    }
+
+    @Override
+    public boolean onSuggestionSelect(int position) {
+        return false;
+    }
+
+    @Override
+    public boolean onSuggestionClick(int position) {
+        Cursor c = (Cursor) mSuggestionsAdapter.getItem(position);
+        String query = c.getString(c.getColumnIndex(SearchManager.SUGGEST_COLUMN_TEXT_1));
+        Toast.makeText(this, "Suggestion clicked: " + query, Toast.LENGTH_LONG).show();
+        return true;
+    }
+
+    private class SuggestionsAdapter extends CursorAdapter {
+
+        public SuggestionsAdapter(Context context, Cursor c) {
+            super(context, c, 0);
+        }
+
+        @Override
+        public View newView(Context context, Cursor cursor, ViewGroup parent) {
+            LayoutInflater inflater = LayoutInflater.from(context);
+            View v = inflater.inflate(android.R.layout.simple_list_item_1, parent, false);
+            return v;
+        }
+
+        @Override
+        public void bindView(View view, Context context, Cursor cursor) {
+            TextView tv = (TextView) view;
+            final int textIndex = cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_TEXT_1);
+            tv.setText(cursor.getString(textIndex));
+        }
+    }
+}
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ShareActionProviders.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ShareActionProviders.java
index 5b7ece2..79a9928 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ShareActionProviders.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/ShareActionProviders.java
@@ -48,7 +48,7 @@ public class ShareActionProviders extends SherlockActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.text);
         ((TextView)findViewById(R.id.text)).setText(R.string.share_action_providers_content);
-        copyPrivateRawResuorceToPubliclyAccessibleFile();
+        copyPrivateRawResourceToPubliclyAccessibleFile();
     }
 
     @Override
@@ -95,7 +95,7 @@ public class ShareActionProviders extends SherlockActivity {
      * Copies a private raw resource content to a publicly readable
      * file such that the latter can be shared with other applications.
      */
-    private void copyPrivateRawResuorceToPubliclyAccessibleFile() {
+    private void copyPrivateRawResourceToPubliclyAccessibleFile() {
         InputStream inputStream = null;
         FileOutputStream outputStream = null;
         try {
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/Simple.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Simple.java
index a5eb843..a5eb843 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/Simple.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Simple.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionItems.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionItems.java
index d155870..d155870 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionItems.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionItems.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionModes.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionModes.java
index e1d7850..e1d7850 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionModes.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SplitActionModes.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/StaticAttachment.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/StaticAttachment.java
index b48bf85..b48bf85 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/StaticAttachment.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/StaticAttachment.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/Styled.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Styled.java
index 4655e20..4655e20 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/Styled.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/Styled.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/SubMenus.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SubMenus.java
index 33e65a5..33e65a5 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/SubMenus.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/SubMenus.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigation.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigation.java
index 19bc031..19bc031 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigation.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigation.java
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigationCollapsed.java b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigationCollapsed.java
index 033d2f5..033d2f5 100644..100755
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigationCollapsed.java
+++ b/actionbarsherlock-samples/demos/src/com/actionbarsherlock/sample/demos/TabNavigationCollapsed.java
diff --git a/samples/fragments/AndroidManifest.xml b/actionbarsherlock-samples/fragments/AndroidManifest.xml
index 57e593d..a431358 100644..100755
--- a/samples/fragments/AndroidManifest.xml
+++ b/actionbarsherlock-samples/fragments/AndroidManifest.xml
@@ -16,9 +16,9 @@
      attribute brings in the Android platform namespace, and the package
      supplies a unique name for the application.  When writing your
      own application, the package name must be changed from "com.example.*"
-     to come from a domain that you own or have control over. --><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock.sample.fragments">
+     to come from a domain that you own or have control over. --><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.fragments">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
 
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
 
@@ -159,6 +159,6 @@
             </intent-filter>
         </activity>
 
-        <provider android:authorities="com.example.android.apis.supportv4.app.LoaderThrottle" android:name=".LoaderThrottleSupport$SimpleProvider"/>
+        <provider android:authorities="com.actionbarsherlock.sample.fragments.LoaderThrottle" android:name=".LoaderThrottleSupport$SimpleProvider"/>
     </application>
 </manifest>
diff --git a/samples/fragments/README.md b/actionbarsherlock-samples/fragments/README.md
index a0198bf..a0198bf 100644..100755
--- a/samples/fragments/README.md
+++ b/actionbarsherlock-samples/fragments/README.md
diff --git a/samples/demos/libs/android-support-v4.jar b/actionbarsherlock-samples/fragments/libs/android-support-v4.jar
index 99e063b..99e063b 100644..100755
--- a/samples/demos/libs/android-support-v4.jar
+++ b/actionbarsherlock-samples/fragments/libs/android-support-v4.jar
diff --git a/actionbarsherlock-samples/fragments/pom.xml b/actionbarsherlock-samples/fragments/pom.xml
new file mode 100755
index 0000000..092a86c
--- /dev/null
+++ b/actionbarsherlock-samples/fragments/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent-sample</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>sample-fragments</artifactId>
+  <name>Sample: Fragments</name>
+  <packaging>apk</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>actionbarsherlock</artifactId>
+      <version>${project.version}</version>
+      <type>apklib</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/fragments/project.properties b/actionbarsherlock-samples/fragments/project.properties
index cd1e0a1..3796f56 100644..100755
--- a/samples/fragments/project.properties
+++ b/actionbarsherlock-samples/fragments/project.properties
@@ -9,5 +9,5 @@
 
 # Project target.
 target=android-14
-android.library.reference.1=../../library
+android.library.reference.1=../../actionbarsherlock
 
diff --git a/samples/fragments/res/anim/decelerate_quint.xml b/actionbarsherlock-samples/fragments/res/anim/decelerate_quint.xml
index ff2d5a9..ff2d5a9 100644..100755
--- a/samples/fragments/res/anim/decelerate_quint.xml
+++ b/actionbarsherlock-samples/fragments/res/anim/decelerate_quint.xml
diff --git a/samples/fragments/res/anim/fragment_slide_left_enter.xml b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_left_enter.xml
index 6bbf6a2..6bbf6a2 100644..100755
--- a/samples/fragments/res/anim/fragment_slide_left_enter.xml
+++ b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_left_enter.xml
diff --git a/samples/fragments/res/anim/fragment_slide_left_exit.xml b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_left_exit.xml
index 0affbc7..0affbc7 100644..100755
--- a/samples/fragments/res/anim/fragment_slide_left_exit.xml
+++ b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_left_exit.xml
diff --git a/samples/fragments/res/anim/fragment_slide_right_enter.xml b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_right_enter.xml
index e2e1168..e2e1168 100644..100755
--- a/samples/fragments/res/anim/fragment_slide_right_enter.xml
+++ b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_right_enter.xml
diff --git a/samples/fragments/res/anim/fragment_slide_right_exit.xml b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_right_exit.xml
index c8e6e7c..c8e6e7c 100644..100755
--- a/samples/fragments/res/anim/fragment_slide_right_exit.xml
+++ b/actionbarsherlock-samples/fragments/res/anim/fragment_slide_right_exit.xml
diff --git a/samples/fragments/res/drawable-hdpi/alert_dialog_icon.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/alert_dialog_icon.png
index fe54477..fe54477 100755
--- a/samples/fragments/res/drawable-hdpi/alert_dialog_icon.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/alert_dialog_icon.png
diff --git a/samples/fragments/res/drawable-hdpi/ic_compose.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_compose.png
index cdb09e4..cdb09e4 100644..100755
--- a/samples/fragments/res/drawable-hdpi/ic_compose.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_compose.png
diff --git a/samples/fragments/res/drawable-hdpi/ic_compose_inverse.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_compose_inverse.png
index 8a0c487..8a0c487 100644..100755
--- a/samples/fragments/res/drawable-hdpi/ic_compose_inverse.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_compose_inverse.png
diff --git a/samples/fragments/res/drawable-hdpi/ic_refresh.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_refresh.png
index 08c32e0..08c32e0 100644..100755
--- a/samples/fragments/res/drawable-hdpi/ic_refresh.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_refresh.png
diff --git a/samples/fragments/res/drawable-hdpi/ic_refresh_inverse.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_refresh_inverse.png
index 9ab1d38..9ab1d38 100644..100755
--- a/samples/fragments/res/drawable-hdpi/ic_refresh_inverse.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_refresh_inverse.png
diff --git a/samples/fragments/res/drawable-hdpi/ic_search.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_search.png
index 59de344..59de344 100644..100755
--- a/samples/fragments/res/drawable-hdpi/ic_search.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_search.png
diff --git a/samples/fragments/res/drawable-hdpi/ic_search_inverse.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_search_inverse.png
index eb090a6..eb090a6 100644..100755
--- a/samples/fragments/res/drawable-hdpi/ic_search_inverse.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/ic_search_inverse.png
diff --git a/samples/fragments/res/drawable-hdpi/icon.png b/actionbarsherlock-samples/fragments/res/drawable-hdpi/icon.png
index 723fbf0..723fbf0 100644..100755
--- a/samples/fragments/res/drawable-hdpi/icon.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-hdpi/icon.png
diff --git a/samples/fragments/res/drawable-ldpi/icon.png b/actionbarsherlock-samples/fragments/res/drawable-ldpi/icon.png
index 181f679..181f679 100644..100755
--- a/samples/fragments/res/drawable-ldpi/icon.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-ldpi/icon.png
diff --git a/samples/fragments/res/drawable-mdpi/alert_dialog_icon.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/alert_dialog_icon.png
index 0a7de04..0a7de04 100644..100755
--- a/samples/fragments/res/drawable-mdpi/alert_dialog_icon.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/alert_dialog_icon.png
diff --git a/samples/fragments/res/drawable-mdpi/ic_compose.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_compose.png
index 15a4130..15a4130 100644..100755
--- a/samples/fragments/res/drawable-mdpi/ic_compose.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_compose.png
diff --git a/samples/fragments/res/drawable-mdpi/ic_compose_inverse.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_compose_inverse.png
index de58ce8..de58ce8 100644..100755
--- a/samples/fragments/res/drawable-mdpi/ic_compose_inverse.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_compose_inverse.png
diff --git a/samples/fragments/res/drawable-mdpi/ic_refresh.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_refresh.png
index 55c43c3..55c43c3 100644..100755
--- a/samples/fragments/res/drawable-mdpi/ic_refresh.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_refresh.png
diff --git a/samples/fragments/res/drawable-mdpi/ic_refresh_inverse.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_refresh_inverse.png
index d5736ec..d5736ec 100644..100755
--- a/samples/fragments/res/drawable-mdpi/ic_refresh_inverse.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_refresh_inverse.png
diff --git a/samples/fragments/res/drawable-mdpi/ic_search.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_search.png
index 75339d9..75339d9 100644..100755
--- a/samples/fragments/res/drawable-mdpi/ic_search.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_search.png
diff --git a/samples/fragments/res/drawable-mdpi/ic_search_inverse.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_search_inverse.png
index b462c32..b462c32 100644..100755
--- a/samples/fragments/res/drawable-mdpi/ic_search_inverse.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/ic_search_inverse.png
diff --git a/samples/fragments/res/drawable-mdpi/icon.png b/actionbarsherlock-samples/fragments/res/drawable-mdpi/icon.png
index 79f50d8..79f50d8 100644..100755
--- a/samples/fragments/res/drawable-mdpi/icon.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-mdpi/icon.png
diff --git a/samples/fragments/res/drawable-xhdpi/icon.png b/actionbarsherlock-samples/fragments/res/drawable-xhdpi/icon.png
index 34ca9a4..34ca9a4 100644..100755
--- a/samples/fragments/res/drawable-xhdpi/icon.png
+++ b/actionbarsherlock-samples/fragments/res/drawable-xhdpi/icon.png
diff --git a/samples/fragments/res/layout-land/fragment_arguments_support.xml b/actionbarsherlock-samples/fragments/res/layout-land/fragment_arguments_support.xml
index a812fa0..a812fa0 100644..100755
--- a/samples/fragments/res/layout-land/fragment_arguments_support.xml
+++ b/actionbarsherlock-samples/fragments/res/layout-land/fragment_arguments_support.xml
diff --git a/samples/fragments/res/layout-land/fragment_layout_support.xml b/actionbarsherlock-samples/fragments/res/layout-land/fragment_layout_support.xml
index 495162b..495162b 100644..100755
--- a/samples/fragments/res/layout-land/fragment_layout_support.xml
+++ b/actionbarsherlock-samples/fragments/res/layout-land/fragment_layout_support.xml
diff --git a/samples/fragments/res/layout/fragment_arguments_support.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_arguments_support.xml
index 63ee0b1..63ee0b1 100644..100755
--- a/samples/fragments/res/layout/fragment_arguments_support.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_arguments_support.xml
diff --git a/samples/fragments/res/layout/fragment_context_menu.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_context_menu.xml
index b5dac8e..b5dac8e 100644..100755
--- a/samples/fragments/res/layout/fragment_context_menu.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_context_menu.xml
diff --git a/samples/fragments/res/layout/fragment_dialog.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_dialog.xml
index f9dec59..f9dec59 100644..100755
--- a/samples/fragments/res/layout/fragment_dialog.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_dialog.xml
diff --git a/samples/fragments/res/layout/fragment_dialog_or_activity.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_dialog_or_activity.xml
index 295f017..295f017 100644..100755
--- a/samples/fragments/res/layout/fragment_dialog_or_activity.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_dialog_or_activity.xml
diff --git a/samples/fragments/res/layout/fragment_hide_show_support.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_hide_show_support.xml
index 45001bd..45001bd 100644..100755
--- a/samples/fragments/res/layout/fragment_hide_show_support.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_hide_show_support.xml
diff --git a/samples/fragments/res/layout/fragment_layout_support.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_layout_support.xml
index da82394..da82394 100644..100755
--- a/samples/fragments/res/layout/fragment_layout_support.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_layout_support.xml
diff --git a/samples/fragments/res/layout/fragment_menu.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_menu.xml
index 7f0278c..7f0278c 100644..100755
--- a/samples/fragments/res/layout/fragment_menu.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_menu.xml
diff --git a/samples/fragments/res/layout/fragment_pager.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_pager.xml
index afaf3e7..afaf3e7 100644..100755
--- a/samples/fragments/res/layout/fragment_pager.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_pager.xml
diff --git a/samples/fragments/res/layout/fragment_pager_list.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_pager_list.xml
index c817ae5..c817ae5 100644..100755
--- a/samples/fragments/res/layout/fragment_pager_list.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_pager_list.xml
diff --git a/samples/fragments/res/layout/fragment_retain_instance.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_retain_instance.xml
index 0dc3985..0dc3985 100644..100755
--- a/samples/fragments/res/layout/fragment_retain_instance.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_retain_instance.xml
diff --git a/samples/fragments/res/layout/fragment_stack.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_stack.xml
index 1d12496..1d12496 100644..100755
--- a/samples/fragments/res/layout/fragment_stack.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_stack.xml
diff --git a/samples/fragments/res/layout/fragment_tabs.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_tabs.xml
index 0fb142c..0fb142c 100644..100755
--- a/samples/fragments/res/layout/fragment_tabs.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_tabs.xml
diff --git a/samples/fragments/res/layout/fragment_tabs_pager.xml b/actionbarsherlock-samples/fragments/res/layout/fragment_tabs_pager.xml
index c36cf3c..c36cf3c 100644..100755
--- a/samples/fragments/res/layout/fragment_tabs_pager.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/fragment_tabs_pager.xml
diff --git a/samples/fragments/res/layout/hello_world.xml b/actionbarsherlock-samples/fragments/res/layout/hello_world.xml
index 3d90a33..3d90a33 100644..100755
--- a/samples/fragments/res/layout/hello_world.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/hello_world.xml
diff --git a/samples/fragments/res/layout/labeled_text_edit.xml b/actionbarsherlock-samples/fragments/res/layout/labeled_text_edit.xml
index 27568af..27568af 100644..100755
--- a/samples/fragments/res/layout/labeled_text_edit.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/labeled_text_edit.xml
diff --git a/samples/fragments/res/layout/list_item_icon_text.xml b/actionbarsherlock-samples/fragments/res/layout/list_item_icon_text.xml
index c3825b7..c3825b7 100644..100755
--- a/samples/fragments/res/layout/list_item_icon_text.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/list_item_icon_text.xml
diff --git a/samples/fragments/res/layout/receive_result.xml b/actionbarsherlock-samples/fragments/res/layout/receive_result.xml
index 5deb2ac..5deb2ac 100644..100755
--- a/samples/fragments/res/layout/receive_result.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/receive_result.xml
diff --git a/samples/fragments/res/layout/send_result.xml b/actionbarsherlock-samples/fragments/res/layout/send_result.xml
index bdd927c..bdd927c 100644..100755
--- a/samples/fragments/res/layout/send_result.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/send_result.xml
diff --git a/samples/fragments/res/layout/simple_list_item_checkable_1.xml b/actionbarsherlock-samples/fragments/res/layout/simple_list_item_checkable_1.xml
index d122b5c..d122b5c 100644..100755
--- a/samples/fragments/res/layout/simple_list_item_checkable_1.xml
+++ b/actionbarsherlock-samples/fragments/res/layout/simple_list_item_checkable_1.xml
diff --git a/samples/fragments/res/menu/shortcuts.xml b/actionbarsherlock-samples/fragments/res/menu/shortcuts.xml
index b5e938a..b5e938a 100644..100755
--- a/samples/fragments/res/menu/shortcuts.xml
+++ b/actionbarsherlock-samples/fragments/res/menu/shortcuts.xml
diff --git a/samples/fragments/res/values/attrs.xml b/actionbarsherlock-samples/fragments/res/values/attrs.xml
index 0459aa5..0459aa5 100644..100755
--- a/samples/fragments/res/values/attrs.xml
+++ b/actionbarsherlock-samples/fragments/res/values/attrs.xml
diff --git a/samples/fragments/res/values/colors.xml b/actionbarsherlock-samples/fragments/res/values/colors.xml
index a52502e..a52502e 100644..100755
--- a/samples/fragments/res/values/colors.xml
+++ b/actionbarsherlock-samples/fragments/res/values/colors.xml
diff --git a/samples/fragments/res/values/strings.xml b/actionbarsherlock-samples/fragments/res/values/strings.xml
index 858d100..858d100 100644..100755
--- a/samples/fragments/res/values/strings.xml
+++ b/actionbarsherlock-samples/fragments/res/values/strings.xml
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/CheckableFrameLayout.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/CheckableFrameLayout.java
index cb6b7a4..cb6b7a4 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/CheckableFrameLayout.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/CheckableFrameLayout.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/Cheeses.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/Cheeses.java
index cc288bc..cc288bc 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/Cheeses.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/Cheeses.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentAlertDialogSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentAlertDialogSupport.java
index 6c6abef..6c6abef 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentAlertDialogSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentAlertDialogSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentArgumentsSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentArgumentsSupport.java
index 3310e0b..3310e0b 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentArgumentsSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentArgumentsSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentContextMenuSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentContextMenuSupport.java
index a01e8bd..a01e8bd 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentContextMenuSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentContextMenuSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentCustomAnimationSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentCustomAnimationSupport.java
index 125103a..125103a 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentCustomAnimationSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentCustomAnimationSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogOrActivitySupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogOrActivitySupport.java
index 718fc20..718fc20 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogOrActivitySupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogOrActivitySupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogSupport.java
index ef9837b..ef9837b 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentDialogSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentHideShowSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentHideShowSupport.java
index 41ce407..41ce407 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentHideShowSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentHideShowSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentLayoutSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentLayoutSupport.java
index e3f6a92..e3f6a92 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentLayoutSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentLayoutSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentListArraySupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentListArraySupport.java
index 9462375..9462375 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentListArraySupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentListArraySupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentMenuSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentMenuSupport.java
index 58c818d..58c818d 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentMenuSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentMenuSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentPagerSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentPagerSupport.java
index a531b15..a531b15 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentPagerSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentPagerSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentReceiveResultSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentReceiveResultSupport.java
index fda6d1c..fda6d1c 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentReceiveResultSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentReceiveResultSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentRetainInstanceSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentRetainInstanceSupport.java
index a6f5a73..a6f5a73 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentRetainInstanceSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentRetainInstanceSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStackSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStackSupport.java
index 9e044a6..9e044a6 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStackSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStackSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStatePagerSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStatePagerSupport.java
index 433c7e3..433c7e3 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStatePagerSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentStatePagerSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabs.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabs.java
index e6dbd94..e6dbd94 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabs.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabs.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabsPager.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabsPager.java
index d50092f..d50092f 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabsPager.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/FragmentTabsPager.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCursorSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCursorSupport.java
index e465a2b..08140c7 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCursorSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCursorSupport.java
@@ -97,7 +97,8 @@ public class LoaderCursorSupport extends SherlockFragmentActivity {
             MenuItem item = menu.add("Search");
             item.setIcon(android.R.drawable.ic_menu_search);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-            View searchView = SearchViewCompat.newSearchView(getActivity());
+            SherlockFragmentActivity activity = (SherlockFragmentActivity)getActivity();
+            View searchView = SearchViewCompat.newSearchView(activity.getSupportActionBar().getThemedContext());
             if (searchView != null) {
                 SearchViewCompat.setOnQueryTextListener(searchView,
                         new OnQueryTextListenerCompat() {
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCustomSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCustomSupport.java
index e1852cd..e1852cd 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCustomSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderCustomSupport.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderThrottleSupport.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderThrottleSupport.java
index 85dbd87..0495fc9 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderThrottleSupport.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/LoaderThrottleSupport.java
@@ -61,7 +61,7 @@ public class LoaderThrottleSupport extends SherlockFragmentActivity {
     /**
      * The authority we use to get to our sample provider.
      */
-    public static final String AUTHORITY = "com.example.android.apis.supportv4.app.LoaderThrottle";
+    public static final String AUTHORITY = "com.actionbarsherlock.sample.fragments.LoaderThrottle";
 
     /**
      * Definition of the contract for the main table of our provider.
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/SampleList.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/SampleList.java
index 5ec19f1..5ec19f1 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/SampleList.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/SampleList.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/SendResult.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/SendResult.java
index fa1c28a..fa1c28a 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/SendResult.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/SendResult.java
diff --git a/samples/fragments/src/com/actionbarsherlock/sample/fragments/Shakespeare.java b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/Shakespeare.java
index 66e243f..66e243f 100644..100755
--- a/samples/fragments/src/com/actionbarsherlock/sample/fragments/Shakespeare.java
+++ b/actionbarsherlock-samples/fragments/src/com/actionbarsherlock/sample/fragments/Shakespeare.java
diff --git a/actionbarsherlock-samples/known-bugs/AndroidManifest.xml b/actionbarsherlock-samples/known-bugs/AndroidManifest.xml
new file mode 100755
index 0000000..d27c629
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/AndroidManifest.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.knownbugs">
+
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
+
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+
+    <application android:icon="@drawable/icon" android:label="@string/application_name" android:theme="@style/Theme.Sherlock">
+
+        <activity android:label="@string/activity_name" android:name=".SampleList">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <!-- OPEN BUGS -->
+
+        <activity android:label="Issue #240" android:name=".Issue240">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.OPEN"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:label="Issue #272" android:name=".Issue272">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.OPEN"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:label="Issue #331" android:name=".Issue331">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.OPEN"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:label="Issue #738" android:name=".Issue738">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.OPEN"/>
+            </intent-filter>
+        </activity>
+
+        <!-- CLOSED BUGS -->
+
+        <activity android:label="Issue #379" android:name=".Issue379" android:theme="@style/Theme.Issue379" android:uiOptions="splitActionBarWhenNarrow">
+            <!-- Fixed in 4.2.0 -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.CLOSED"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:label="Issue #425" android:name=".Issue435">
+            <!-- Fixed in 4.1.0 -->
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.CLOSED"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:label="Issue #659" android:name=".Issue659" >
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.CLOSED"/>
+            </intent-filter>
+            <meta-data android:name="android.app.searchable"
+                       android:value=".Issue659"
+                       android:resource="@xml/searchable_issue659"/>
+        </activity>
+
+        <provider android:name=".Issue659SuggestionsProvider"
+                  android:authorities="com.actionbarsherlock.sample.knownbugs.Issue659SuggestionsProvider" />
+
+        <activity android:label="Issue #882" android:name=".Issue882">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="com.actionbarsherlock.sample.knownbugs.CLOSED"/>
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/samples/known-bugs/README.md b/actionbarsherlock-samples/known-bugs/README.md
index aa19bef..aa19bef 100644..100755
--- a/samples/known-bugs/README.md
+++ b/actionbarsherlock-samples/known-bugs/README.md
diff --git a/samples/fragments/libs/android-support-v4.jar b/actionbarsherlock-samples/known-bugs/libs/android-support-v4.jar
index 99e063b..99e063b 100644..100755
--- a/samples/fragments/libs/android-support-v4.jar
+++ b/actionbarsherlock-samples/known-bugs/libs/android-support-v4.jar
diff --git a/actionbarsherlock-samples/known-bugs/pom.xml b/actionbarsherlock-samples/known-bugs/pom.xml
new file mode 100755
index 0000000..4601132
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent-sample</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>sample-known-bugs</artifactId>
+  <name>Sample: Known Bugs</name>
+  <packaging>apk</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>actionbarsherlock</artifactId>
+      <version>${project.version}</version>
+      <type>apklib</type>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/roboguice/project.properties b/actionbarsherlock-samples/known-bugs/project.properties
index 602c3af..2eb2ae3 100644..100755
--- a/samples/roboguice/project.properties
+++ b/actionbarsherlock-samples/known-bugs/project.properties
@@ -9,7 +9,11 @@
 
 # Project target.
 target=android-14
-android.library.reference.1=../../library
+android.library.reference.1=../../actionbarsherlock
+
+
+
+
 
 
 
diff --git a/samples/known-bugs/res/anim/issue331_refresh.xml b/actionbarsherlock-samples/known-bugs/res/anim/issue331_refresh.xml
index 30de199..30de199 100644..100755
--- a/samples/known-bugs/res/anim/issue331_refresh.xml
+++ b/actionbarsherlock-samples/known-bugs/res/anim/issue331_refresh.xml
diff --git a/samples/known-bugs/res/drawable-hdpi/ic_refresh.png b/actionbarsherlock-samples/known-bugs/res/drawable-hdpi/ic_refresh.png
index 08c32e0..08c32e0 100644..100755
--- a/samples/known-bugs/res/drawable-hdpi/ic_refresh.png
+++ b/actionbarsherlock-samples/known-bugs/res/drawable-hdpi/ic_refresh.png
diff --git a/samples/known-bugs/res/drawable-hdpi/icon.png b/actionbarsherlock-samples/known-bugs/res/drawable-hdpi/icon.png
index 723fbf0..723fbf0 100644..100755
--- a/samples/known-bugs/res/drawable-hdpi/icon.png
+++ b/actionbarsherlock-samples/known-bugs/res/drawable-hdpi/icon.png
diff --git a/samples/known-bugs/res/drawable-ldpi/icon.png b/actionbarsherlock-samples/known-bugs/res/drawable-ldpi/icon.png
index 181f679..181f679 100644..100755
--- a/samples/known-bugs/res/drawable-ldpi/icon.png
+++ b/actionbarsherlock-samples/known-bugs/res/drawable-ldpi/icon.png
diff --git a/samples/known-bugs/res/drawable-mdpi/ic_refresh.png b/actionbarsherlock-samples/known-bugs/res/drawable-mdpi/ic_refresh.png
index 55c43c3..55c43c3 100644..100755
--- a/samples/known-bugs/res/drawable-mdpi/ic_refresh.png
+++ b/actionbarsherlock-samples/known-bugs/res/drawable-mdpi/ic_refresh.png
diff --git a/samples/known-bugs/res/drawable-mdpi/icon.png b/actionbarsherlock-samples/known-bugs/res/drawable-mdpi/icon.png
index 79f50d8..79f50d8 100644..100755
--- a/samples/known-bugs/res/drawable-mdpi/icon.png
+++ b/actionbarsherlock-samples/known-bugs/res/drawable-mdpi/icon.png
diff --git a/samples/known-bugs/res/drawable-xhdpi/icon.png b/actionbarsherlock-samples/known-bugs/res/drawable-xhdpi/icon.png
index 34ca9a4..34ca9a4 100644..100755
--- a/samples/known-bugs/res/drawable-xhdpi/icon.png
+++ b/actionbarsherlock-samples/known-bugs/res/drawable-xhdpi/icon.png
diff --git a/actionbarsherlock-samples/known-bugs/res/layout/issue240.xml b/actionbarsherlock-samples/known-bugs/res/layout/issue240.xml
new file mode 100755
index 0000000..ba63ee4
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/layout/issue240.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:padding="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:text="Swipe left/right when the tabs are in collapsed mode (landscape on a phone) and the selected item does not update."/>
+
+</LinearLayout>
diff --git a/actionbarsherlock-samples/known-bugs/res/layout/issue272_fragment_pager.xml b/actionbarsherlock-samples/known-bugs/res/layout/issue272_fragment_pager.xml
new file mode 100755
index 0000000..32f7c8f
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/layout/issue272_fragment_pager.xml
@@ -0,0 +1,52 @@
+<?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.
+-->
+
+<!-- Top-level content view for the simple fragment sample. -->
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:padding="4dip"
+        android:gravity="center_horizontal"
+        android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1">
+    </android.support.v4.view.ViewPager>
+
+    <TextView
+        android:layout_width="match_parent" 
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:text="Simple Fragment based ViewPager whose Fragments provide menu actions to the host Activity. Swipe once on pre ICS to load in a new fragment. New action menu items become unresponsive and appear to be rendered twice. Swipe again and the actions pressed previously will fire on the new fragment."/>
+    
+    <LinearLayout android:orientation="horizontal"
+            android:gravity="center" android:measureWithLargestChild="true"
+            android:layout_width="match_parent" android:layout_height="wrap_content"
+            android:layout_weight="0">
+        <Button android:id="@+id/goto_first"
+            android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:text="First">
+        </Button>
+        <Button android:id="@+id/goto_last"
+            android:layout_width="wrap_content" android:layout_height="wrap_content"
+            android:text="Last">
+        </Button>
+    </LinearLayout>
+</LinearLayout>
+
diff --git a/actionbarsherlock-samples/known-bugs/res/layout/issue272_fragment_pager_list.xml b/actionbarsherlock-samples/known-bugs/res/layout/issue272_fragment_pager_list.xml
new file mode 100755
index 0000000..363174f
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/layout/issue272_fragment_pager_list.xml
@@ -0,0 +1,54 @@
+<?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.
+-->
+
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:drawable/gallery_thumb">
+
+    <TextView android:id="@+id/text"
+        android:layout_width="match_parent" android:layout_height="wrap_content"
+        android:gravity="center_vertical|center_horizontal"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="Hello, world!"/>
+
+    <!-- The frame layout is here since we will be showing either
+    the empty view or the list view.  -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" >
+        <!-- Here is the list. Since we are using a ListActivity, we
+             have to call it "@android:id/list" so ListActivity will
+             find it -->
+        <ListView android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:drawSelectorOnTop="false"/>
+
+        <!-- Here is the view to show if the list is emtpy -->
+        <TextView android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="No items."/>
+
+    </FrameLayout>
+
+</LinearLayout>
+
diff --git a/samples/known-bugs/res/layout/issue331_action_view.xml b/actionbarsherlock-samples/known-bugs/res/layout/issue331_action_view.xml
index e77ec08..e77ec08 100644..100755
--- a/samples/known-bugs/res/layout/issue331_action_view.xml
+++ b/actionbarsherlock-samples/known-bugs/res/layout/issue331_action_view.xml
diff --git a/actionbarsherlock-samples/known-bugs/res/layout/issue738_spinner_dropdown_item.xml b/actionbarsherlock-samples/known-bugs/res/layout/issue738_spinner_dropdown_item.xml
new file mode 100755
index 0000000..82d4f03
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/layout/issue738_spinner_dropdown_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml
+**
+** 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.
+*/
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <TextView
+        android:id="@android:id/text1"
+        style="?attr/spinnerDropDownItemStyle"
+        android:layout_width="match_parent"
+        android:layout_weight="1"
+        android:layout_height="?attr/dropdownListPreferredItemHeight" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/actionbarsherlock-samples/known-bugs/res/layout/issue882.xml b/actionbarsherlock-samples/known-bugs/res/layout/issue882.xml
new file mode 100755
index 0000000..dde1a45
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/layout/issue882.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:padding="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:text="In collapsed mode, select Fragment 10 from the spinner.  Tap the spinner again to display the choices.  On native, Fragment 10 is shown on the list, on ABS, Fragment 1 is shown instead."/>
+
+</LinearLayout>
diff --git a/actionbarsherlock-samples/known-bugs/res/menu/issue659.xml b/actionbarsherlock-samples/known-bugs/res/menu/issue659.xml
new file mode 100755
index 0000000..245f49c
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/menu/issue659.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/action_search"
+        android:title="Search"
+        android:actionViewClass="com.actionbarsherlock.widget.SearchView"
+        android:showAsAction="always|collapseActionView"
+        />
+
+</menu>
\ No newline at end of file
diff --git a/actionbarsherlock-samples/known-bugs/res/values/issue379.xml b/actionbarsherlock-samples/known-bugs/res/values/issue379.xml
new file mode 100755
index 0000000..3637088
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/values/issue379.xml
@@ -0,0 +1,17 @@
+<resources>
+    <style name="Theme.Issue379" parent="@style/Theme.Sherlock">
+        <item name="android:actionBarStyle">@style/Widget.Issue379.ActionBar</item>
+        <item name="actionBarStyle">@style/Widget.Issue379.ActionBar</item>
+    </style>
+
+    <style name="Widget.Issue379.ActionBar" parent="@style/Widget.Sherlock.ActionBar">
+        <item name="android:background">#ffff0000</item>
+        <item name="background">#ffff0000</item>
+
+        <item name="android:backgroundStacked">#ff00ff00</item>
+        <item name="backgroundStacked">#ff00ff00</item>
+
+        <item name="android:backgroundSplit">#ff0000ff</item>
+        <item name="backgroundSplit">#ff0000ff</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/samples/known-bugs/res/values/strings.xml b/actionbarsherlock-samples/known-bugs/res/values/strings.xml
index 4dc4249..d57fd81 100644..100755
--- a/samples/known-bugs/res/values/strings.xml
+++ b/actionbarsherlock-samples/known-bugs/res/values/strings.xml
@@ -3,4 +3,5 @@
 <resources>
     <string name="application_name">ActionBarSherlock Known Bugs</string>
     <string name="activity_name">ABS: Bugs</string>
+    <string name="search_hint">Sample Search Hint</string>
 </resources>
diff --git a/actionbarsherlock-samples/known-bugs/res/xml/searchable_issue659.xml b/actionbarsherlock-samples/known-bugs/res/xml/searchable_issue659.xml
new file mode 100755
index 0000000..f65648d
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/res/xml/searchable_issue659.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/application_name"
+    android:hint="@string/search_hint"
+    android:searchSuggestAuthority="com.actionbarsherlock.sample.knownbugs.Issue659SuggestionsProvider"
+    android:searchSuggestSelection=" ?" >
+</searchable>
\ No newline at end of file
diff --git a/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue240.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue240.java
new file mode 100755
index 0000000..6c214b9
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue240.java
@@ -0,0 +1,145 @@
+/*
+ * 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.
+ */
+
+package com.actionbarsherlock.sample.knownbugs;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+import static android.support.v4.view.ViewPager.OnPageChangeListener;
+import static android.view.Gravity.CENTER;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_TABS;
+import static com.actionbarsherlock.app.ActionBar.TabListener;
+
+public class Issue240 extends SherlockFragmentActivity implements OnPageChangeListener, TabListener {
+    private static final int COUNT = 10;
+
+    ViewPager mPager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.issue240);
+
+        mPager = (ViewPager)findViewById(R.id.pager);
+        mPager.setAdapter(new MyAdapter(getSupportFragmentManager()));
+        mPager.setOnPageChangeListener(this);
+
+        ActionBar ab = getSupportActionBar();
+        ab.setNavigationMode(NAVIGATION_MODE_TABS);
+        for (int i = 1; i <= COUNT; i++) {
+            ab.addTab(ab.newTab().setText("Tab " + i).setTabListener(this));
+        }
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        getSupportActionBar().setSelectedNavigationItem(position);
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+    }
+
+    @Override
+    public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
+        mPager.setCurrentItem(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    public static class MyAdapter extends FragmentStatePagerAdapter {
+        public MyAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public int getCount() {
+            return COUNT;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return BoringFragment.newInstance(position + 1);
+        }
+    }
+
+    public static class BoringFragment extends SherlockFragment {
+        int mNum;
+
+        /**
+         * Create a new instance of CountingFragment, providing "num"
+         * as an argument.
+         */
+        static BoringFragment newInstance(int num) {
+          BoringFragment f = new BoringFragment();
+
+            // Supply num input as an argument.
+            Bundle args = new Bundle();
+            args.putInt("num", num);
+            f.setArguments(args);
+
+            return f;
+        }
+
+        /**
+         * When creating, retrieve this instance's number from its arguments.
+         */
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mNum = getArguments() != null ? getArguments().getInt("num") : 1;
+        }
+
+        /**
+         * The Fragment's UI is just a simple text view showing its
+         * instance number.
+         */
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                                 Bundle savedInstanceState) {
+            TextView tv = new TextView(getActivity());
+            tv.setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+            tv.setText("Fragment #" + mNum);
+            tv.setGravity(CENTER);
+            return tv;
+        }
+
+    }
+}
+
diff --git a/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue272.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue272.java
new file mode 100755
index 0000000..d4f16e5
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue272.java
@@ -0,0 +1,297 @@
+/*
+ * 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.
+ */
+
+package com.actionbarsherlock.sample.knownbugs;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.app.SherlockListFragment;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
+public class Issue272 extends SherlockFragmentActivity {
+    static final int NUM_ITEMS = 10;
+
+    MyAdapter mAdapter;
+
+    ViewPager mPager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.issue272_fragment_pager);
+
+        mAdapter = new MyAdapter(getSupportFragmentManager());
+
+        mPager = (ViewPager) findViewById(R.id.pager);
+        mPager.setAdapter(mAdapter);
+
+        // Watch for button clicks.
+        Button button = (Button) findViewById(R.id.goto_first);
+        button.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                mPager.setCurrentItem(0);
+            }
+        });
+        button = (Button) findViewById(R.id.goto_last);
+        button.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                mPager.setCurrentItem(NUM_ITEMS - 1);
+            }
+        });
+    }
+
+    public static class MyAdapter extends FragmentStatePagerAdapter {
+        public MyAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public int getCount() {
+            return NUM_ITEMS;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return ArrayListFragment.newInstance(position);
+        }
+    }
+
+    public static class ArrayListFragment extends SherlockListFragment {
+        int mNum;
+
+        /**
+         * Create a new instance of CountingFragment, providing "num"
+         * as an argument.
+         */
+        static ArrayListFragment newInstance(int num) {
+            ArrayListFragment f = new ArrayListFragment();
+
+            // Supply num input as an argument.
+            Bundle args = new Bundle();
+            args.putInt("num", num);
+            f.setArguments(args);
+
+            return f;
+        }
+
+        /**
+         * When creating, retrieve this instance's number from its arguments.
+         */
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mNum = getArguments() != null ? getArguments().getInt("num") : 1;
+            // tell the hosting activity we have options menu
+            setHasOptionsMenu(true);
+        }
+
+        /**
+         * The Fragment's UI is just a simple text view showing its
+         * instance number.
+         */
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                                 Bundle savedInstanceState) {
+            View v = inflater.inflate(R.layout.issue272_fragment_pager_list, container, false);
+            View tv = v.findViewById(R.id.text);
+            ((TextView) tv).setText("Fragment #" + mNum);
+            return v;
+        }
+
+        @Override
+        public void onActivityCreated(Bundle savedInstanceState) {
+            super.onActivityCreated(savedInstanceState);
+            setListAdapter(new ArrayAdapter<String>(getActivity(),
+                    android.R.layout.simple_list_item_1, sCheeseStrings));
+        }
+
+        @Override
+        public void onListItemClick(ListView l, View v, int position, long id) {
+            Log.i("FragmentList", "Item clicked: " + id);
+        }
+
+        // create our fragment's options menu
+
+        @Override
+        public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+
+            menu.add("Refresh")
+                    .setIcon(R.drawable.ic_refresh)
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+            menu.add("Save")
+                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+
+        }
+
+        @Override
+        public boolean onOptionsItemSelected(MenuItem item) {
+            Toast.makeText(getActivity(), item.getTitle() + " action for page " + mNum, Toast.LENGTH_SHORT).show();
+            return true;
+        }
+
+
+    }
+
+    public static final String[] sCheeseStrings = {
+            "Abbaye de Belloc", "Abbaye du Mont des Cats", "Abertam", "Abondance", "Ackawi",
+            "Acorn", "Adelost", "Affidelice au Chablis", "Afuega'l Pitu", "Airag", "Airedale",
+            "Aisy Cendre", "Allgauer Emmentaler", "Alverca", "Ambert", "American Cheese",
+            "Ami du Chambertin", "Anejo Enchilado", "Anneau du Vic-Bilh", "Anthoriro", "Appenzell",
+            "Aragon", "Ardi Gasna", "Ardrahan", "Armenian String", "Aromes au Gene de Marc",
+            "Asadero", "Asiago", "Aubisque Pyrenees", "Autun", "Avaxtskyr", "Baby Swiss",
+            "Babybel", "Baguette Laonnaise", "Bakers", "Baladi", "Balaton", "Bandal", "Banon",
+            "Barry's Bay Cheddar", "Basing", "Basket Cheese", "Bath Cheese", "Bavarian Bergkase",
+            "Baylough", "Beaufort", "Beauvoorde", "Beenleigh Blue", "Beer Cheese", "Bel Paese",
+            "Bergader", "Bergere Bleue", "Berkswell", "Beyaz Peynir", "Bierkase", "Bishop Kennedy",
+            "Blarney", "Bleu d'Auvergne", "Bleu de Gex", "Bleu de Laqueuille",
+            "Bleu de Septmoncel", "Bleu Des Causses", "Blue", "Blue Castello", "Blue Rathgore",
+            "Blue Vein (Australian)", "Blue Vein Cheeses", "Bocconcini", "Bocconcini (Australian)",
+            "Boeren Leidenkaas", "Bonchester", "Bosworth", "Bougon", "Boule Du Roves",
+            "Boulette d'Avesnes", "Boursault", "Boursin", "Bouyssou", "Bra", "Braudostur",
+            "Breakfast Cheese", "Brebis du Lavort", "Brebis du Lochois", "Brebis du Puyfaucon",
+            "Bresse Bleu", "Brick", "Brie", "Brie de Meaux", "Brie de Melun", "Brillat-Savarin",
+            "Brin", "Brin d' Amour", "Brin d'Amour", "Brinza (Burduf Brinza)",
+            "Briquette de Brebis", "Briquette du Forez", "Broccio", "Broccio Demi-Affine",
+            "Brousse du Rove", "Bruder Basil", "Brusselae Kaas (Fromage de Bruxelles)", "Bryndza",
+            "Buchette d'Anjou", "Buffalo", "Burgos", "Butte", "Butterkase", "Button (Innes)",
+            "Buxton Blue", "Cabecou", "Caboc", "Cabrales", "Cachaille", "Caciocavallo", "Caciotta",
+            "Caerphilly", "Cairnsmore", "Calenzana", "Cambazola", "Camembert de Normandie",
+            "Canadian Cheddar", "Canestrato", "Cantal", "Caprice des Dieux", "Capricorn Goat",
+            "Capriole Banon", "Carre de l'Est", "Casciotta di Urbino", "Cashel Blue", "Castellano",
+            "Castelleno", "Castelmagno", "Castelo Branco", "Castigliano", "Cathelain",
+            "Celtic Promise", "Cendre d'Olivet", "Cerney", "Chabichou", "Chabichou du Poitou",
+            "Chabis de Gatine", "Chaource", "Charolais", "Chaumes", "Cheddar",
+            "Cheddar Clothbound", "Cheshire", "Chevres", "Chevrotin des Aravis", "Chontaleno",
+            "Civray", "Coeur de Camembert au Calvados", "Coeur de Chevre", "Colby", "Cold Pack",
+            "Comte", "Coolea", "Cooleney", "Coquetdale", "Corleggy", "Cornish Pepper",
+            "Cotherstone", "Cotija", "Cottage Cheese", "Cottage Cheese (Australian)",
+            "Cougar Gold", "Coulommiers", "Coverdale", "Crayeux de Roncq", "Cream Cheese",
+            "Cream Havarti", "Crema Agria", "Crema Mexicana", "Creme Fraiche", "Crescenza",
+            "Croghan", "Crottin de Chavignol", "Crottin du Chavignol", "Crowdie", "Crowley",
+            "Cuajada", "Curd", "Cure Nantais", "Curworthy", "Cwmtawe Pecorino",
+            "Cypress Grove Chevre", "Danablu (Danish Blue)", "Danbo", "Danish Fontina",
+            "Daralagjazsky", "Dauphin", "Delice des Fiouves", "Denhany Dorset Drum", "Derby",
+            "Dessertnyj Belyj", "Devon Blue", "Devon Garland", "Dolcelatte", "Doolin",
+            "Doppelrhamstufel", "Dorset Blue Vinney", "Double Gloucester", "Double Worcester",
+            "Dreux a la Feuille", "Dry Jack", "Duddleswell", "Dunbarra", "Dunlop", "Dunsyre Blue",
+            "Duroblando", "Durrus", "Dutch Mimolette (Commissiekaas)", "Edam", "Edelpilz",
+            "Emental Grand Cru", "Emlett", "Emmental", "Epoisses de Bourgogne", "Esbareich",
+            "Esrom", "Etorki", "Evansdale Farmhouse Brie", "Evora De L'Alentejo", "Exmoor Blue",
+            "Explorateur", "Feta", "Feta (Australian)", "Figue", "Filetta", "Fin-de-Siecle",
+            "Finlandia Swiss", "Finn", "Fiore Sardo", "Fleur du Maquis", "Flor de Guia",
+            "Flower Marie", "Folded", "Folded cheese with mint", "Fondant de Brebis",
+            "Fontainebleau", "Fontal", "Fontina Val d'Aosta", "Formaggio di capra", "Fougerus",
+            "Four Herb Gouda", "Fourme d' Ambert", "Fourme de Haute Loire", "Fourme de Montbrison",
+            "Fresh Jack", "Fresh Mozzarella", "Fresh Ricotta", "Fresh Truffles", "Fribourgeois",
+            "Friesekaas", "Friesian", "Friesla", "Frinault", "Fromage a Raclette", "Fromage Corse",
+            "Fromage de Montagne de Savoie", "Fromage Frais", "Fruit Cream Cheese",
+            "Frying Cheese", "Fynbo", "Gabriel", "Galette du Paludier", "Galette Lyonnaise",
+            "Galloway Goat's Milk Gems", "Gammelost", "Gaperon a l'Ail", "Garrotxa", "Gastanberra",
+            "Geitost", "Gippsland Blue", "Gjetost", "Gloucester", "Golden Cross", "Gorgonzola",
+            "Gornyaltajski", "Gospel Green", "Gouda", "Goutu", "Gowrie", "Grabetto", "Graddost",
+            "Grafton Village Cheddar", "Grana", "Grana Padano", "Grand Vatel",
+            "Grataron d' Areches", "Gratte-Paille", "Graviera", "Greuilh", "Greve",
+            "Gris de Lille", "Gruyere", "Gubbeen", "Guerbigny", "Halloumi",
+            "Halloumy (Australian)", "Haloumi-Style Cheese", "Harbourne Blue", "Havarti",
+            "Heidi Gruyere", "Hereford Hop", "Herrgardsost", "Herriot Farmhouse", "Herve",
+            "Hipi Iti", "Hubbardston Blue Cow", "Hushallsost", "Iberico", "Idaho Goatster",
+            "Idiazabal", "Il Boschetto al Tartufo", "Ile d'Yeu", "Isle of Mull", "Jarlsberg",
+            "Jermi Tortes", "Jibneh Arabieh", "Jindi Brie", "Jubilee Blue", "Juustoleipa",
+            "Kadchgall", "Kaseri", "Kashta", "Kefalotyri", "Kenafa", "Kernhem", "Kervella Affine",
+            "Kikorangi", "King Island Cape Wickham Brie", "King River Gold", "Klosterkaese",
+            "Knockalara", "Kugelkase", "L'Aveyronnais", "L'Ecir de l'Aubrac", "La Taupiniere",
+            "La Vache Qui Rit", "Laguiole", "Lairobell", "Lajta", "Lanark Blue", "Lancashire",
+            "Langres", "Lappi", "Laruns", "Lavistown", "Le Brin", "Le Fium Orbo", "Le Lacandou",
+            "Le Roule", "Leafield", "Lebbene", "Leerdammer", "Leicester", "Leyden", "Limburger",
+            "Lincolnshire Poacher", "Lingot Saint Bousquet d'Orb", "Liptauer", "Little Rydings",
+            "Livarot", "Llanboidy", "Llanglofan Farmhouse", "Loch Arthur Farmhouse",
+            "Loddiswell Avondale", "Longhorn", "Lou Palou", "Lou Pevre", "Lyonnais", "Maasdam",
+            "Macconais", "Mahoe Aged Gouda", "Mahon", "Malvern", "Mamirolle", "Manchego",
+            "Manouri", "Manur", "Marble Cheddar", "Marbled Cheeses", "Maredsous", "Margotin",
+            "Maribo", "Maroilles", "Mascares", "Mascarpone", "Mascarpone (Australian)",
+            "Mascarpone Torta", "Matocq", "Maytag Blue", "Meira", "Menallack Farmhouse",
+            "Menonita", "Meredith Blue", "Mesost", "Metton (Cancoillotte)", "Meyer Vintage Gouda",
+            "Mihalic Peynir", "Milleens", "Mimolette", "Mine-Gabhar", "Mini Baby Bells", "Mixte",
+            "Molbo", "Monastery Cheeses", "Mondseer", "Mont D'or Lyonnais", "Montasio",
+            "Monterey Jack", "Monterey Jack Dry", "Morbier", "Morbier Cru de Montagne",
+            "Mothais a la Feuille", "Mozzarella", "Mozzarella (Australian)",
+            "Mozzarella di Bufala", "Mozzarella Fresh, in water", "Mozzarella Rolls", "Munster",
+            "Murol", "Mycella", "Myzithra", "Naboulsi", "Nantais", "Neufchatel",
+            "Neufchatel (Australian)", "Niolo", "Nokkelost", "Northumberland", "Oaxaca",
+            "Olde York", "Olivet au Foin", "Olivet Bleu", "Olivet Cendre",
+            "Orkney Extra Mature Cheddar", "Orla", "Oschtjepka", "Ossau Fermier", "Ossau-Iraty",
+            "Oszczypek", "Oxford Blue", "P'tit Berrichon", "Palet de Babligny", "Paneer", "Panela",
+            "Pannerone", "Pant ys Gawn", "Parmesan (Parmigiano)", "Parmigiano Reggiano",
+            "Pas de l'Escalette", "Passendale", "Pasteurized Processed", "Pate de Fromage",
+            "Patefine Fort", "Pave d'Affinois", "Pave d'Auge", "Pave de Chirac", "Pave du Berry",
+            "Pecorino", "Pecorino in Walnut Leaves", "Pecorino Romano", "Peekskill Pyramid",
+            "Pelardon des Cevennes", "Pelardon des Corbieres", "Penamellera", "Penbryn",
+            "Pencarreg", "Perail de Brebis", "Petit Morin", "Petit Pardou", "Petit-Suisse",
+            "Picodon de Chevre", "Picos de Europa", "Piora", "Pithtviers au Foin",
+            "Plateau de Herve", "Plymouth Cheese", "Podhalanski", "Poivre d'Ane", "Polkolbin",
+            "Pont l'Eveque", "Port Nicholson", "Port-Salut", "Postel", "Pouligny-Saint-Pierre",
+            "Pourly", "Prastost", "Pressato", "Prince-Jean", "Processed Cheddar", "Provolone",
+            "Provolone (Australian)", "Pyengana Cheddar", "Pyramide", "Quark",
+            "Quark (Australian)", "Quartirolo Lombardo", "Quatre-Vents", "Quercy Petit",
+            "Queso Blanco", "Queso Blanco con Frutas --Pina y Mango", "Queso de Murcia",
+            "Queso del Montsec", "Queso del Tietar", "Queso Fresco", "Queso Fresco (Adobera)",
+            "Queso Iberico", "Queso Jalapeno", "Queso Majorero", "Queso Media Luna",
+            "Queso Para Frier", "Queso Quesadilla", "Rabacal", "Raclette", "Ragusano", "Raschera",
+            "Reblochon", "Red Leicester", "Regal de la Dombes", "Reggianito", "Remedou",
+            "Requeson", "Richelieu", "Ricotta", "Ricotta (Australian)", "Ricotta Salata", "Ridder",
+            "Rigotte", "Rocamadour", "Rollot", "Romano", "Romans Part Dieu", "Roncal", "Roquefort",
+            "Roule", "Rouleau De Beaulieu", "Royalp Tilsit", "Rubens", "Rustinu", "Saaland Pfarr",
+            "Saanenkaese", "Saga", "Sage Derby", "Sainte Maure", "Saint-Marcellin",
+            "Saint-Nectaire", "Saint-Paulin", "Salers", "Samso", "San Simon", "Sancerre",
+            "Sap Sago", "Sardo", "Sardo Egyptian", "Sbrinz", "Scamorza", "Schabzieger", "Schloss",
+            "Selles sur Cher", "Selva", "Serat", "Seriously Strong Cheddar", "Serra da Estrela",
+            "Sharpam", "Shelburne Cheddar", "Shropshire Blue", "Siraz", "Sirene", "Smoked Gouda",
+            "Somerset Brie", "Sonoma Jack", "Sottocenare al Tartufo", "Soumaintrain",
+            "Sourire Lozerien", "Spenwood", "Sraffordshire Organic", "St. Agur Blue Cheese",
+            "Stilton", "Stinking Bishop", "String", "Sussex Slipcote", "Sveciaost", "Swaledale",
+            "Sweet Style Swiss", "Swiss", "Syrian (Armenian String)", "Tala", "Taleggio", "Tamie",
+            "Tasmania Highland Chevre Log", "Taupiniere", "Teifi", "Telemea", "Testouri",
+            "Tete de Moine", "Tetilla", "Texas Goat Cheese", "Tibet", "Tillamook Cheddar",
+            "Tilsit", "Timboon Brie", "Toma", "Tomme Brulee", "Tomme d'Abondance",
+            "Tomme de Chevre", "Tomme de Romans", "Tomme de Savoie", "Tomme des Chouans", "Tommes",
+            "Torta del Casar", "Toscanello", "Touree de L'Aubier", "Tourmalet",
+            "Trappe (Veritable)", "Trois Cornes De Vendee", "Tronchon", "Trou du Cru", "Truffe",
+            "Tupi", "Turunmaa", "Tymsboro", "Tyn Grug", "Tyning", "Ubriaco", "Ulloa",
+            "Vacherin-Fribourgeois", "Valencay", "Vasterbottenost", "Venaco", "Vendomois",
+            "Vieux Corse", "Vignotte", "Vulscombe", "Waimata Farmhouse Blue",
+            "Washed Rind Cheese (Australian)", "Waterloo", "Weichkaese", "Wellington",
+            "Wensleydale", "White Stilton", "Whitestone Farmhouse", "Wigmore", "Woodside Cabecou",
+            "Xanadu", "Xynotyro", "Yarg Cornish", "Yarra Valley Pyramid", "Yorkshire Blue",
+            "Zamorano", "Zanetti Grana Padano", "Zanetti Parmigiano Reggiano"
+    };
+}
+
diff --git a/samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue331.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue331.java
index f442ce4..259d9b1 100644..100755
--- a/samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue331.java
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue331.java
@@ -33,10 +33,10 @@ public class Issue331 extends SherlockActivity {
         if (mShow) {
             menu.add("Refresh").setIcon(R.drawable.ic_refresh).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
-        return true;
+        return mShow;
     }
 
-    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+    public boolean onOptionsItemSelected(MenuItem item) {
         ImageView iv = (ImageView) LayoutInflater.from(this).inflate(R.layout.issue331_action_view, null);
         Animation r = AnimationUtils.loadAnimation(this, R.anim.issue331_refresh);
         r.setRepeatCount(Animation.INFINITE);
diff --git a/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue379.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue379.java
new file mode 100755
index 0000000..954764c
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue379.java
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package com.actionbarsherlock.sample.knownbugs;
+
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.widget.TextView;
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockActivity;
+import com.actionbarsherlock.view.Menu;
+
+import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_TABS;
+import static com.actionbarsherlock.view.MenuItem.SHOW_AS_ACTION_ALWAYS;
+import static com.actionbarsherlock.view.MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+
+public class Issue379 extends SherlockActivity implements ActionBar.TabListener {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActionBar ab = getSupportActionBar();
+        ab.setNavigationMode(NAVIGATION_MODE_TABS);
+        ab.addTab(ab.newTab().setTabListener(this).setText("Test"));
+
+        TextView tv = new TextView(this);
+        tv.setText("ColorDrawable ignores bounds on pre-HC. Make sure you see three colors.");
+        setContentView(tv);
+    }
+
+    @Override public boolean onCreateOptionsMenu(Menu menu) {
+        menu.add("Test").setShowAsAction(SHOW_AS_ACTION_ALWAYS | SHOW_AS_ACTION_WITH_TEXT);
+        return true;
+    }
+
+    @Override
+    public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+}
diff --git a/samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue435.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue435.java
index 6b26565..6b26565 100644..100755
--- a/samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue435.java
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue435.java
diff --git a/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue659.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue659.java
new file mode 100755
index 0000000..3b18722
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue659.java
@@ -0,0 +1,46 @@
+package com.actionbarsherlock.sample.knownbugs;
+
+import android.app.SearchManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.SearchRecentSuggestions;
+import android.widget.Toast;
+import com.actionbarsherlock.R;
+import com.actionbarsherlock.app.SherlockActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.widget.SearchView;
+
+/**
+ * Example of Search Suggestions not working for SearchView.
+ */
+public class Issue659 extends SherlockActivity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+            String query = intent.getStringExtra(SearchManager.QUERY);
+            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this,
+                    Issue659SuggestionsProvider.AUTHORITY, Issue659SuggestionsProvider.MODE);
+            suggestions.saveRecentQuery(query, null);
+            Toast.makeText(this, "Search called with: " + query, Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getSupportMenuInflater();
+        inflater.inflate(R.menu.issue659, menu);
+
+        // Get the SearchView and set the searchable configuration
+        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+        SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
+        searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+
+        return true;
+    }
+}
diff --git a/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue659SuggestionsProvider.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue659SuggestionsProvider.java
new file mode 100755
index 0000000..3fbb259
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue659SuggestionsProvider.java
@@ -0,0 +1,15 @@
+package com.actionbarsherlock.sample.knownbugs;
+
+import android.content.SearchRecentSuggestionsProvider;
+
+/**
+ * Sample search recent suggestions provider. For Issue 659
+ */
+public class Issue659SuggestionsProvider extends SearchRecentSuggestionsProvider {
+    public final static String AUTHORITY = "com.actionbarsherlock.sample.knownbugs.Issue659SuggestionsProvider";
+    public final static int MODE = DATABASE_MODE_QUERIES;
+
+    public Issue659SuggestionsProvider() {
+        setupSuggestions(AUTHORITY, MODE);
+    }
+}
diff --git a/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue738.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue738.java
new file mode 100755
index 0000000..521cfb3
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue738.java
@@ -0,0 +1,56 @@
+package com.actionbarsherlock.sample.knownbugs;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.SpinnerAdapter;
+import android.widget.TextView;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockActivity;
+
+public class Issue738 extends SherlockActivity implements ActionBar.OnNavigationListener {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getSupportActionBar().setListNavigationCallbacks(new DropdownItemAdapter(this), this);
+        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(int itemPosition, long itemId) {
+        return true;
+    }
+
+    private class DropdownItemAdapter extends ArrayAdapter<String> implements SpinnerAdapter {
+
+        private static final String LONG_TEXT = "This long text wraps in API 15,16 but does not wrap in API 10.";
+
+        Activity activity;
+        private String[] labels = new String[] {"short1", LONG_TEXT};
+
+        public DropdownItemAdapter(Activity activity) {
+            super(activity, R.layout.sherlock_spinner_item, new String[] {"short1", LONG_TEXT});
+
+            this.activity = activity;
+        }
+
+        @Override
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            LayoutInflater inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            convertView = inflater.inflate(R.layout.issue738_spinner_dropdown_item, null);
+
+            TextView title = ((TextView) convertView.findViewById(android.R.id.text1));
+            title.setText(labels[position]);
+
+            return convertView;
+        }
+    }
+}
diff --git a/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue882.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue882.java
new file mode 100755
index 0000000..90d06da
--- /dev/null
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/Issue882.java
@@ -0,0 +1,131 @@
+package com.actionbarsherlock.sample.knownbugs;
+
+import static android.view.Gravity.CENTER;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static com.actionbarsherlock.app.ActionBar.NAVIGATION_MODE_TABS;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
+import android.support.v4.view.ViewPager.OnPageChangeListener;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.ActionBar.TabListener;
+import com.actionbarsherlock.app.SherlockFragment;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+public class Issue882 extends SherlockFragmentActivity implements
+        OnPageChangeListener, TabListener {
+    private static final int COUNT = 20;
+
+    ViewPager mPager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.issue882);
+
+        mPager = (ViewPager) findViewById(R.id.pager);
+        mPager.setAdapter(new MyAdapter(getSupportFragmentManager()));
+        mPager.setOnPageChangeListener(this);
+
+        ActionBar ab = getSupportActionBar();
+        ab.setNavigationMode(NAVIGATION_MODE_TABS);
+        for (int i = 1; i <= COUNT; i++) {
+            ab.addTab(ab.newTab().setText("Fragment " + i).setTabListener(this));
+        }
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset,
+            int positionOffsetPixels) {
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        getSupportActionBar().setSelectedNavigationItem(position);
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+    }
+
+    @Override
+    public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
+        mPager.setCurrentItem(tab.getPosition());
+    }
+
+    @Override
+    public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    @Override
+    public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
+    }
+
+    public static class MyAdapter extends FragmentStatePagerAdapter {
+        public MyAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public int getCount() {
+            return COUNT;
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return BoringFragment.newInstance(position + 1);
+        }
+    }
+
+    public static class BoringFragment extends SherlockFragment {
+        int mNum;
+
+        /**
+         * Create a new instance of CountingFragment, providing "num" as an
+         * argument.
+         */
+        static BoringFragment newInstance(int num) {
+            BoringFragment f = new BoringFragment();
+
+            // Supply num input as an argument.
+            Bundle args = new Bundle();
+            args.putInt("num", num);
+            f.setArguments(args);
+
+            return f;
+        }
+
+        /**
+         * When creating, retrieve this instance's number from its arguments.
+         */
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mNum = getArguments() != null ? getArguments().getInt("num") : 1;
+        }
+
+        /**
+         * The Fragment's UI is just a simple text view showing its instance
+         * number.
+         */
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            TextView tv = new TextView(getActivity());
+            tv.setLayoutParams(new ViewGroup.LayoutParams(MATCH_PARENT,
+                    MATCH_PARENT));
+            tv.setText("Fragment #" + mNum);
+            tv.setGravity(CENTER);
+            return tv;
+        }
+
+    }
+}
diff --git a/samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/SampleList.java b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/SampleList.java
index 4289a02..4289a02 100644..100755
--- a/samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/SampleList.java
+++ b/actionbarsherlock-samples/known-bugs/src/com/actionbarsherlock/sample/knownbugs/SampleList.java
diff --git a/actionbarsherlock-samples/pom.xml b/actionbarsherlock-samples/pom.xml
new file mode 100755
index 0000000..a50fdd8
--- /dev/null
+++ b/actionbarsherlock-samples/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>parent-sample</artifactId>
+  <name>Sample (Parent)</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>demos</module>
+    <module>fragments</module>
+    <module>known-bugs</module>
+    <module>roboguice</module>
+    <module>styled</module>
+  </modules>
+</project>
diff --git a/samples/roboguice/AndroidManifest.xml b/actionbarsherlock-samples/roboguice/AndroidManifest.xml
index b671f20..d8c410f 100644..100755
--- a/samples/roboguice/AndroidManifest.xml
+++ b/actionbarsherlock-samples/roboguice/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock.sample.roboguice">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.roboguice">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 
diff --git a/samples/roboguice/README.md b/actionbarsherlock-samples/roboguice/README.md
index ec09b5f..ec09b5f 100644..100755
--- a/samples/roboguice/README.md
+++ b/actionbarsherlock-samples/roboguice/README.md
diff --git a/samples/known-bugs/libs/android-support-v4.jar b/actionbarsherlock-samples/roboguice/libs/android-support-v4.jar
index 99e063b..99e063b 100644..100755
--- a/samples/known-bugs/libs/android-support-v4.jar
+++ b/actionbarsherlock-samples/roboguice/libs/android-support-v4.jar
diff --git a/samples/roboguice/libs/guice-3.0-no_aop.jar b/actionbarsherlock-samples/roboguice/libs/guice-3.0-no_aop.jar
index ef3a55b..ef3a55b 100644..100755
--- a/samples/roboguice/libs/guice-3.0-no_aop.jar
+++ b/actionbarsherlock-samples/roboguice/libs/guice-3.0-no_aop.jar
diff --git a/samples/roboguice/libs/javax.inject-1.jar b/actionbarsherlock-samples/roboguice/libs/javax.inject-1.jar
index b2a9d0b..b2a9d0b 100644..100755
--- a/samples/roboguice/libs/javax.inject-1.jar
+++ b/actionbarsherlock-samples/roboguice/libs/javax.inject-1.jar
diff --git a/samples/roboguice/libs/roboguice-2.0b4.jar b/actionbarsherlock-samples/roboguice/libs/roboguice-2.0b4.jar
index 4704414..4704414 100644..100755
--- a/samples/roboguice/libs/roboguice-2.0b4.jar
+++ b/actionbarsherlock-samples/roboguice/libs/roboguice-2.0b4.jar
diff --git a/samples/roboguice/libs/roboguice-sherlock-1.0.jar b/actionbarsherlock-samples/roboguice/libs/roboguice-sherlock-1.0.jar
index 604b007..604b007 100644..100755
--- a/samples/roboguice/libs/roboguice-sherlock-1.0.jar
+++ b/actionbarsherlock-samples/roboguice/libs/roboguice-sherlock-1.0.jar
diff --git a/actionbarsherlock-samples/roboguice/pom.xml b/actionbarsherlock-samples/roboguice/pom.xml
new file mode 100755
index 0000000..84c6aca
--- /dev/null
+++ b/actionbarsherlock-samples/roboguice/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent-sample</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>sample-roboguice</artifactId>
+  <name>Sample: RoboGuice</name>
+  <packaging>apk</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>actionbarsherlock</artifactId>
+      <version>${project.version}</version>
+      <type>apklib</type>
+    </dependency>
+    <dependency>
+      <groupId>com.github.rtyley</groupId>
+      <artifactId>roboguice-sherlock</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/demos/project.properties b/actionbarsherlock-samples/roboguice/project.properties
index d29d6c7..15ce1ae 100644..100755
--- a/samples/demos/project.properties
+++ b/actionbarsherlock-samples/roboguice/project.properties
@@ -9,8 +9,7 @@
 
 # Project target.
 target=android-14
-android.library.reference.1=../../library
-
+android.library.reference.1=../../actionbarsherlock
 
 
 
diff --git a/samples/roboguice/res/anim/expletive_animation.xml b/actionbarsherlock-samples/roboguice/res/anim/expletive_animation.xml
index 9d11d8d..9d11d8d 100644..100755
--- a/samples/roboguice/res/anim/expletive_animation.xml
+++ b/actionbarsherlock-samples/roboguice/res/anim/expletive_animation.xml
diff --git a/samples/roboguice/res/drawable-hdpi/icon.png b/actionbarsherlock-samples/roboguice/res/drawable-hdpi/icon.png
index 723fbf0..723fbf0 100644..100755
--- a/samples/roboguice/res/drawable-hdpi/icon.png
+++ b/actionbarsherlock-samples/roboguice/res/drawable-hdpi/icon.png
diff --git a/samples/roboguice/res/drawable-ldpi/icon.png b/actionbarsherlock-samples/roboguice/res/drawable-ldpi/icon.png
index 181f679..181f679 100644..100755
--- a/samples/roboguice/res/drawable-ldpi/icon.png
+++ b/actionbarsherlock-samples/roboguice/res/drawable-ldpi/icon.png
diff --git a/samples/roboguice/res/drawable-mdpi/icon.png b/actionbarsherlock-samples/roboguice/res/drawable-mdpi/icon.png
index 79f50d8..79f50d8 100644..100755
--- a/samples/roboguice/res/drawable-mdpi/icon.png
+++ b/actionbarsherlock-samples/roboguice/res/drawable-mdpi/icon.png
diff --git a/samples/roboguice/res/drawable-xhdpi/icon.png b/actionbarsherlock-samples/roboguice/res/drawable-xhdpi/icon.png
index 34ca9a4..34ca9a4 100644..100755
--- a/samples/roboguice/res/drawable-xhdpi/icon.png
+++ b/actionbarsherlock-samples/roboguice/res/drawable-xhdpi/icon.png
diff --git a/samples/roboguice/res/layout/fight_evil.xml b/actionbarsherlock-samples/roboguice/res/layout/fight_evil.xml
index a44ecce..a44ecce 100644..100755
--- a/samples/roboguice/res/layout/fight_evil.xml
+++ b/actionbarsherlock-samples/roboguice/res/layout/fight_evil.xml
diff --git a/samples/roboguice/res/layout/main.xml b/actionbarsherlock-samples/roboguice/res/layout/main.xml
index c608c7a..c608c7a 100644..100755
--- a/samples/roboguice/res/layout/main.xml
+++ b/actionbarsherlock-samples/roboguice/res/layout/main.xml
diff --git a/samples/roboguice/res/values/strings.xml b/actionbarsherlock-samples/roboguice/res/values/strings.xml
index 5025c0f..5025c0f 100644..100755
--- a/samples/roboguice/res/values/strings.xml
+++ b/actionbarsherlock-samples/roboguice/res/values/strings.xml
diff --git a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/AstroboyMasterConsole.java b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/AstroboyMasterConsole.java
index 6625e5e..6625e5e 100644..100755
--- a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/AstroboyMasterConsole.java
+++ b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/AstroboyMasterConsole.java
diff --git a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/FightForcesOfEvilActivity.java b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/FightForcesOfEvilActivity.java
index f28748a..f28748a 100644..100755
--- a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/FightForcesOfEvilActivity.java
+++ b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/activity/FightForcesOfEvilActivity.java
diff --git a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/Astroboy.java b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/Astroboy.java
index be3211e..be3211e 100644..100755
--- a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/Astroboy.java
+++ b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/Astroboy.java
diff --git a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/AstroboyRemoteControl.java b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/AstroboyRemoteControl.java
index fc9b67c..fc9b67c 100644..100755
--- a/samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/AstroboyRemoteControl.java
+++ b/actionbarsherlock-samples/roboguice/src/com/actionbarsherlock/sample/roboguice/controller/AstroboyRemoteControl.java
diff --git a/samples/styled/AndroidManifest.xml b/actionbarsherlock-samples/styled/AndroidManifest.xml
index 11a56df..f9eb172 100644..100755
--- a/samples/styled/AndroidManifest.xml
+++ b/actionbarsherlock-samples/styled/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="80" android:versionName="4.1.0" package="com.actionbarsherlock.sample.styled">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="431" android:versionName="4.3.1" package="com.actionbarsherlock.sample.styled">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
 
diff --git a/samples/styled/README.md b/actionbarsherlock-samples/styled/README.md
index 6323b1d..6323b1d 100644..100755
--- a/samples/styled/README.md
+++ b/actionbarsherlock-samples/styled/README.md
diff --git a/samples/roboguice/libs/android-support-v4.jar b/actionbarsherlock-samples/styled/libs/android-support-v4.jar
index 99e063b..99e063b 100644..100755
--- a/samples/roboguice/libs/android-support-v4.jar
+++ b/actionbarsherlock-samples/styled/libs/android-support-v4.jar
diff --git a/samples/styled/libs/nineoldandroids-2.2.0.jar b/actionbarsherlock-samples/styled/libs/nineoldandroids-2.2.0.jar
index 50a62e1..50a62e1 100644..100755
--- a/samples/styled/libs/nineoldandroids-2.2.0.jar
+++ b/actionbarsherlock-samples/styled/libs/nineoldandroids-2.2.0.jar
diff --git a/actionbarsherlock-samples/styled/pom.xml b/actionbarsherlock-samples/styled/pom.xml
new file mode 100755
index 0000000..c550c47
--- /dev/null
+++ b/actionbarsherlock-samples/styled/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent-sample</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>sample-styled</artifactId>
+  <name>Sample: Styled</name>
+  <packaging>apk</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>actionbarsherlock</artifactId>
+      <version>${project.version}</version>
+      <type>apklib</type>
+    </dependency>
+    <dependency>
+      <groupId>com.nineoldandroids</groupId>
+      <artifactId>library</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/known-bugs/project.properties b/actionbarsherlock-samples/styled/project.properties
index d29d6c7..5bedb16 100644..100755
--- a/samples/known-bugs/project.properties
+++ b/actionbarsherlock-samples/styled/project.properties
@@ -9,7 +9,8 @@
 
 # Project target.
 target=android-14
-android.library.reference.1=../../library
+android.library.reference.1=../../actionbarsherlock
+
 
 
 
diff --git a/samples/styled/res/drawable-hdpi/ic_stat_android.png b/actionbarsherlock-samples/styled/res/drawable-hdpi/ic_stat_android.png
index eb01dd0..eb01dd0 100644..100755
--- a/samples/styled/res/drawable-hdpi/ic_stat_android.png
+++ b/actionbarsherlock-samples/styled/res/drawable-hdpi/ic_stat_android.png
diff --git a/samples/styled/res/drawable-hdpi/icon.png b/actionbarsherlock-samples/styled/res/drawable-hdpi/icon.png
index 723fbf0..723fbf0 100644..100755
--- a/samples/styled/res/drawable-hdpi/icon.png
+++ b/actionbarsherlock-samples/styled/res/drawable-hdpi/icon.png
diff --git a/samples/styled/res/drawable-ldpi/ic_stat_android.png b/actionbarsherlock-samples/styled/res/drawable-ldpi/ic_stat_android.png
index ecfc1f6..ecfc1f6 100644..100755
--- a/samples/styled/res/drawable-ldpi/ic_stat_android.png
+++ b/actionbarsherlock-samples/styled/res/drawable-ldpi/ic_stat_android.png
diff --git a/samples/styled/res/drawable-ldpi/icon.png b/actionbarsherlock-samples/styled/res/drawable-ldpi/icon.png
index 181f679..181f679 100644..100755
--- a/samples/styled/res/drawable-ldpi/icon.png
+++ b/actionbarsherlock-samples/styled/res/drawable-ldpi/icon.png
diff --git a/samples/styled/res/drawable-mdpi/ad_btn_check_off_pressed_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_check_off_pressed_holo_light.png
index 9ca4c60..9ca4c60 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_btn_check_off_pressed_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_check_off_pressed_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/ad_btn_check_on_pressed_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_check_on_pressed_holo_light.png
index 45f69c3..45f69c3 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_btn_check_on_pressed_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_check_on_pressed_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/ad_btn_radio_off_pressed_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_radio_off_pressed_holo_light.png
index f4393fc..f4393fc 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_btn_radio_off_pressed_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_radio_off_pressed_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/ad_btn_radio_on_pressed_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_radio_on_pressed_holo_light.png
index 2f54feb..2f54feb 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_btn_radio_on_pressed_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_btn_radio_on_pressed_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/ad_logo.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_logo.png
index 0d8f2c9..0d8f2c9 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_logo.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_logo.png
diff --git a/samples/styled/res/drawable-mdpi/ad_menu_dropdown_panel_holo_light.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_menu_dropdown_panel_holo_light.9.png
index 421b99b..421b99b 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_menu_dropdown_panel_holo_light.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_menu_dropdown_panel_holo_light.9.png
diff --git a/samples/styled/res/drawable-mdpi/ad_spinner_focused_holo_light.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_spinner_focused_holo_light.9.png
index 5bbbf63..5bbbf63 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_spinner_focused_holo_light.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_spinner_focused_holo_light.9.png
diff --git a/samples/styled/res/drawable-mdpi/ad_spinner_pressed_holo_light.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_spinner_pressed_holo_light.9.png
index f95e6d2..f95e6d2 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_spinner_pressed_holo_light.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_spinner_pressed_holo_light.9.png
diff --git a/samples/styled/res/drawable-mdpi/ad_tab_selected_holo.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_tab_selected_holo.9.png
index 14cdbd0..14cdbd0 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_tab_selected_holo.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_tab_selected_holo.9.png
diff --git a/samples/styled/res/drawable-mdpi/ad_tab_selected_pressed_holo.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_tab_selected_pressed_holo.9.png
index 04d3f6c..04d3f6c 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_tab_selected_pressed_holo.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_tab_selected_pressed_holo.9.png
diff --git a/samples/styled/res/drawable-mdpi/ad_tab_unselected_holo.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_tab_unselected_holo.9.png
index 458214c..458214c 100644..100755
--- a/samples/styled/res/drawable-mdpi/ad_tab_unselected_holo.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ad_tab_unselected_holo.9.png
diff --git a/samples/styled/res/drawable-mdpi/btn_check_off_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_check_off_holo_light.png
index a80c349..a80c349 100644..100755
--- a/samples/styled/res/drawable-mdpi/btn_check_off_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_check_off_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/btn_check_on_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_check_on_holo_light.png
index 8fdb342..8fdb342 100644..100755
--- a/samples/styled/res/drawable-mdpi/btn_check_on_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_check_on_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/btn_radio_off_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_radio_off_holo_light.png
index c67e9fb..c67e9fb 100644..100755
--- a/samples/styled/res/drawable-mdpi/btn_radio_off_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_radio_off_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/btn_radio_on_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_radio_on_holo_light.png
index ed5acc9..ed5acc9 100644..100755
--- a/samples/styled/res/drawable-mdpi/btn_radio_on_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/btn_radio_on_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/ic_menu_refresh_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ic_menu_refresh_holo_light.png
index 604a4fd..604a4fd 100644..100755
--- a/samples/styled/res/drawable-mdpi/ic_menu_refresh_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ic_menu_refresh_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/ic_menu_star_holo_light.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ic_menu_star_holo_light.png
index 77542c4..77542c4 100644..100755
--- a/samples/styled/res/drawable-mdpi/ic_menu_star_holo_light.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ic_menu_star_holo_light.png
diff --git a/samples/styled/res/drawable-mdpi/ic_stat_android.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/ic_stat_android.png
index e91187d..e91187d 100644..100755
--- a/samples/styled/res/drawable-mdpi/ic_stat_android.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/ic_stat_android.png
diff --git a/samples/styled/res/drawable-mdpi/icon.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/icon.png
index 79f50d8..79f50d8 100644..100755
--- a/samples/styled/res/drawable-mdpi/icon.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/icon.png
diff --git a/samples/styled/res/drawable-mdpi/spinner_default_holo_light.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/spinner_default_holo_light.9.png
index c820e40..c820e40 100644..100755
--- a/samples/styled/res/drawable-mdpi/spinner_default_holo_light.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/spinner_default_holo_light.9.png
diff --git a/samples/styled/res/drawable-mdpi/spinner_disabled_holo_light.9.png b/actionbarsherlock-samples/styled/res/drawable-mdpi/spinner_disabled_holo_light.9.png
index 2dba270..2dba270 100644..100755
--- a/samples/styled/res/drawable-mdpi/spinner_disabled_holo_light.9.png
+++ b/actionbarsherlock-samples/styled/res/drawable-mdpi/spinner_disabled_holo_light.9.png
diff --git a/samples/styled/res/drawable-xhdpi/icon.png b/actionbarsherlock-samples/styled/res/drawable-xhdpi/icon.png
index 34ca9a4..34ca9a4 100644..100755
--- a/samples/styled/res/drawable-xhdpi/icon.png
+++ b/actionbarsherlock-samples/styled/res/drawable-xhdpi/icon.png
diff --git a/samples/styled/res/drawable/actionbar_tab_bg.xml b/actionbarsherlock-samples/styled/res/drawable/actionbar_tab_bg.xml
index 9909909..9909909 100644..100755
--- a/samples/styled/res/drawable/actionbar_tab_bg.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/actionbar_tab_bg.xml
diff --git a/samples/styled/res/drawable/ad_action_bar_gradient_bak.xml b/actionbarsherlock-samples/styled/res/drawable/ad_action_bar_gradient_bak.xml
index 0233f4e..0233f4e 100644..100755
--- a/samples/styled/res/drawable/ad_action_bar_gradient_bak.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/ad_action_bar_gradient_bak.xml
diff --git a/samples/styled/res/drawable/ad_btn_check_holo_light.xml b/actionbarsherlock-samples/styled/res/drawable/ad_btn_check_holo_light.xml
index ee2c57e..ee2c57e 100644..100755
--- a/samples/styled/res/drawable/ad_btn_check_holo_light.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/ad_btn_check_holo_light.xml
diff --git a/samples/styled/res/drawable/ad_btn_radio_holo_light.xml b/actionbarsherlock-samples/styled/res/drawable/ad_btn_radio_holo_light.xml
index 15fc3ba..15fc3ba 100644..100755
--- a/samples/styled/res/drawable/ad_btn_radio_holo_light.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/ad_btn_radio_holo_light.xml
diff --git a/samples/styled/res/drawable/ad_selectable_background.xml b/actionbarsherlock-samples/styled/res/drawable/ad_selectable_background.xml
index bbb6800..bbb6800 100644..100755
--- a/samples/styled/res/drawable/ad_selectable_background.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/ad_selectable_background.xml
diff --git a/samples/styled/res/drawable/ad_spinner_background_holo_light.xml b/actionbarsherlock-samples/styled/res/drawable/ad_spinner_background_holo_light.xml
index d8d72bd..d8d72bd 100644..100755
--- a/samples/styled/res/drawable/ad_spinner_background_holo_light.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/ad_spinner_background_holo_light.xml
diff --git a/samples/styled/res/drawable/rounded_rect.xml b/actionbarsherlock-samples/styled/res/drawable/rounded_rect.xml
index bd0e341..bd0e341 100644..100755
--- a/samples/styled/res/drawable/rounded_rect.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/rounded_rect.xml
diff --git a/samples/styled/res/drawable/selected_background.xml b/actionbarsherlock-samples/styled/res/drawable/selected_background.xml
index 546caf2..546caf2 100644..100755
--- a/samples/styled/res/drawable/selected_background.xml
+++ b/actionbarsherlock-samples/styled/res/drawable/selected_background.xml
diff --git a/samples/styled/res/layout/indeterminate_progress_action.xml b/actionbarsherlock-samples/styled/res/layout/indeterminate_progress_action.xml
index 25b5ccb..25b5ccb 100644..100755
--- a/samples/styled/res/layout/indeterminate_progress_action.xml
+++ b/actionbarsherlock-samples/styled/res/layout/indeterminate_progress_action.xml
diff --git a/samples/styled/res/layout/main.xml b/actionbarsherlock-samples/styled/res/layout/main.xml
index dacc557..dacc557 100644..100755
--- a/samples/styled/res/layout/main.xml
+++ b/actionbarsherlock-samples/styled/res/layout/main.xml
diff --git a/samples/styled/res/menu/main_menu.xml b/actionbarsherlock-samples/styled/res/menu/main_menu.xml
index c705525..c705525 100644..100755
--- a/samples/styled/res/menu/main_menu.xml
+++ b/actionbarsherlock-samples/styled/res/menu/main_menu.xml
diff --git a/samples/styled/res/values/arrays.xml b/actionbarsherlock-samples/styled/res/values/arrays.xml
index e6fd23a..e6fd23a 100644..100755
--- a/samples/styled/res/values/arrays.xml
+++ b/actionbarsherlock-samples/styled/res/values/arrays.xml
diff --git a/samples/styled/res/values/colors.xml b/actionbarsherlock-samples/styled/res/values/colors.xml
index 4e6f727..4e6f727 100644..100755
--- a/samples/styled/res/values/colors.xml
+++ b/actionbarsherlock-samples/styled/res/values/colors.xml
diff --git a/samples/styled/res/values/dimens.xml b/actionbarsherlock-samples/styled/res/values/dimens.xml
index 0b21229..0b21229 100644..100755
--- a/samples/styled/res/values/dimens.xml
+++ b/actionbarsherlock-samples/styled/res/values/dimens.xml
diff --git a/samples/styled/res/values/strings.xml b/actionbarsherlock-samples/styled/res/values/strings.xml
index f76eea9..f76eea9 100644..100755
--- a/samples/styled/res/values/strings.xml
+++ b/actionbarsherlock-samples/styled/res/values/strings.xml
diff --git a/samples/styled/res/values/styles.xml b/actionbarsherlock-samples/styled/res/values/styles.xml
index 2669614..a37d2dd 100644..100755
--- a/samples/styled/res/values/styles.xml
+++ b/actionbarsherlock-samples/styled/res/values/styles.xml
@@ -17,7 +17,7 @@
 <resources>
 
     <!-- Variation on the Holo Light theme that styles the Action Bar -->
-    <style name="Theme.AndroidDevelopers" parent="Theme.Sherlock.Light.ForceOverflow">
+    <style name="Theme.AndroidDevelopers" parent="Theme.Sherlock.Light">
         <item name="android:actionBarItemBackground">@drawable/ad_selectable_background</item>
         <item name="actionBarItemBackground">@drawable/ad_selectable_background</item>
         <item name="android:popupMenuStyle">@style/MyPopupMenu</item>
diff --git a/samples/styled/src/com/actionbarsherlock/sample/styled/MainActivity.java b/actionbarsherlock-samples/styled/src/com/actionbarsherlock/sample/styled/MainActivity.java
index 270b888..270b888 100644..100755
--- a/samples/styled/src/com/actionbarsherlock/sample/styled/MainActivity.java
+++ b/actionbarsherlock-samples/styled/src/com/actionbarsherlock/sample/styled/MainActivity.java
diff --git a/samples/styled/src/com/actionbarsherlock/sample/styled/RoundedColourFragment.java b/actionbarsherlock-samples/styled/src/com/actionbarsherlock/sample/styled/RoundedColourFragment.java
index 411f632..411f632 100644..100755
--- a/samples/styled/src/com/actionbarsherlock/sample/styled/RoundedColourFragment.java
+++ b/actionbarsherlock-samples/styled/src/com/actionbarsherlock/sample/styled/RoundedColourFragment.java
diff --git a/library/AndroidManifest.xml b/actionbarsherlock/AndroidManifest.xml
index c4a75f3..7b8a848 100644..100755
--- a/library/AndroidManifest.xml
+++ b/actionbarsherlock/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock">
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
 
 </manifest>
diff --git a/library/README.md b/actionbarsherlock/README.md
index e8a2c08..e8a2c08 100644..100755
--- a/library/README.md
+++ b/actionbarsherlock/README.md
diff --git a/samples/styled/libs/android-support-v4.jar b/actionbarsherlock/libs/android-support-v4.jar
index 99e063b..99e063b 100644..100755
--- a/samples/styled/libs/android-support-v4.jar
+++ b/actionbarsherlock/libs/android-support-v4.jar
diff --git a/actionbarsherlock/pom.xml b/actionbarsherlock/pom.xml
new file mode 100755
index 0000000..f9c9407
--- /dev/null
+++ b/actionbarsherlock/pom.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>com.actionbarsherlock</groupId>
+    <artifactId>parent</artifactId>
+    <version>4.3.1</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>actionbarsherlock</artifactId>
+  <name>ActionBarSherlock</name>
+  <packaging>apklib</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>android</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.android</groupId>
+      <artifactId>support-v4</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.robolectric</groupId>
+      <artifactId>robolectric</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+        <artifactId>android-maven-plugin</artifactId>
+        <extensions>true</extensions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>com.google.code.maven-replacer-plugin</groupId>
+        <artifactId>maven-replacer-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>replace</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <ignoreMissingFile>false</ignoreMissingFile>
+          <file>target/generated-sources/r/com/actionbarsherlock/R.java</file>
+          <outputFile>target/generated-sources/r/com/actionbarsherlock/R.java</outputFile>
+          <regex>false</regex>
+          <token>static final int</token>
+          <value>static int</value>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <type>jar</type>
+                  <file>${project.build.directory}/${project.build.finalName}.jar</file>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>com.google.code.maven-replacer-plugin</groupId>
+                    <artifactId>maven-replacer-plugin</artifactId>
+                    <versionRange>[1.4.0,)</versionRange>
+                    <goals>
+                      <goal>replace</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore />
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/library/project.properties b/actionbarsherlock/project.properties
index 5ca7d62..5ca7d62 100644..100755
--- a/library/project.properties
+++ b/actionbarsherlock/project.properties
diff --git a/library/res/color/abs__primary_text_disable_only_holo_dark.xml b/actionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
index ea7459a..ea7459a 100644..100755
--- a/library/res/color/abs__primary_text_disable_only_holo_dark.xml
+++ b/actionbarsherlock/res/color/abs__primary_text_disable_only_holo_dark.xml
diff --git a/library/res/color/abs__primary_text_disable_only_holo_light.xml b/actionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
index 0edb33b..0edb33b 100644..100755
--- a/library/res/color/abs__primary_text_disable_only_holo_light.xml
+++ b/actionbarsherlock/res/color/abs__primary_text_disable_only_holo_light.xml
diff --git a/library/res/color/abs__primary_text_holo_dark.xml b/actionbarsherlock/res/color/abs__primary_text_holo_dark.xml
index 2bcfd0b..2bcfd0b 100644..100755
--- a/library/res/color/abs__primary_text_holo_dark.xml
+++ b/actionbarsherlock/res/color/abs__primary_text_holo_dark.xml
diff --git a/library/res/color/abs__primary_text_holo_light.xml b/actionbarsherlock/res/color/abs__primary_text_holo_light.xml
index 198384f..198384f 100644..100755
--- a/library/res/color/abs__primary_text_holo_light.xml
+++ b/actionbarsherlock/res/color/abs__primary_text_holo_light.xml
diff --git a/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
index 769463b..769463b 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
index 88f11dc..88f11dc 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
index 7305047..7305047 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
index 712a551..712a551 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
index bf3b943..bf3b943 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
index 6c14157..81b87b8 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
index f4ff16b..8fc83e2 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
index cbbaec5..cbbaec5 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
index af917e5..af917e5 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
index 2d59f35..2d59f35 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
index 0520e5a..0520e5a 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
index e3e3f93..e3e3f93 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 1e39572..1e39572 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
index a16db85..a16db85 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
index 0eff695..0eff695 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
index 219b170..219b170 100644..100755
--- a/library/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
index b0dc31f..b0dc31f 100644..100755
--- a/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
index 4bc2683..4bc2683 100644..100755
--- a/library/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
index 4af38fb..4af38fb 100644..100755
--- a/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
index d32f74c..d32f74c 100644..100755
--- a/library/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 66adffe..66adffe 100644..100755
--- a/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
index caeff9c..caeff9c 100644..100755
--- a/library/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
index 1d836f6..1d836f6 100644..100755
--- a/library/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
index 5818666..5818666 100644..100755
--- a/library/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
index 564fb34..564fb34 100644..100755
--- a/library/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
index ae21b76..ae21b76 100644..100755
--- a/library/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
index 897a1c1..897a1c1 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png
diff --git a/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
index 0c89f71..0c89f71 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png
diff --git a/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
index d8662e3..d8662e3 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png
diff --git a/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
index ed03f62..ed03f62 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_disabled.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
new file mode 100755
index 0000000..d97c342
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_disabled.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_normal.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_normal.png
new file mode 100755
index 0000000..33ad8d4
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_normal.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
new file mode 100755
index 0000000..3edbd74
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
new file mode 100755
index 0000000..90db01b
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png
new file mode 100755
index 0000000..83f36a9
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png
new file mode 100755
index 0000000..a3cc21e
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_go.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_go.png
new file mode 100755
index 0000000..97b825e
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_go.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
new file mode 100755
index 0000000..7e1ba2a
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png
diff --git a/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index 2abc458..2abc458 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index bb6aef1..bb6aef1 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
index 6f747c8..6f747c8 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png
diff --git a/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
index 682b2fd..682b2fd 100644..100755
--- a/library/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_search.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_search.png
new file mode 100755
index 0000000..bf8bd66
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_search.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
new file mode 100755
index 0000000..72e207b
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_voice_search.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_voice_search.png
new file mode 100755
index 0000000..66d14ae
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_voice_search.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
new file mode 100755
index 0000000..3481c98
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/library/res/drawable-hdpi/abs__list_activated_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
index 4ea7afa..4ea7afa 100644..100755
--- a/library/res/drawable-hdpi/abs__list_activated_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_activated_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
index 986ab0b..986ab0b 100644..100755
--- a/library/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
index 0279e17..0279e17 100644..100755
--- a/library/res/drawable-hdpi/abs__list_divider_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__list_focused_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
index 516f5c7..516f5c7 100644..100755
--- a/library/res/drawable-hdpi/abs__list_focused_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_focused_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
index 4ea7afa..4ea7afa 100644..100755
--- a/library/res/drawable-hdpi/abs__list_longpressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
index 5654cd6..5654cd6 100644..100755
--- a/library/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
index 5654cd6..5654cd6 100644..100755
--- a/library/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
index f6fd30d..f6fd30d 100644..100755
--- a/library/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
index ca8e9a2..ca8e9a2 100644..100755
--- a/library/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
index 4d3d208..4d3d208 100644..100755
--- a/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
index 924a99d..924a99d 100644..100755
--- a/library/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
index 310c368..310c368 100644..100755
--- a/library/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
index 70cb7fc..70cb7fc 100644..100755
--- a/library/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
index 1c26920..1c26920 100644..100755
--- a/library/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
index 1c26920..1c26920 100644..100755
--- a/library/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
index 40d0d16..40d0d16 100644..100755
--- a/library/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
index 40d0d16..40d0d16 100644..100755
--- a/library/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
index c8358e9..c8358e9 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_48_inner_holo.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png
diff --git a/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
index f62f74b..f62f74b 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_48_outer_holo.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
index eb28ff9..eb28ff9 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
index d281adb..d281adb 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
index b298586..b298586 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
index 4215396..4215396 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
index a280eab..a280eab 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
index f8d619b..f8d619b 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 955a2f3..955a2f3 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
index 6c22e22..6c22e22 100644..100755
--- a/library/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
index 673e3bf..673e3bf 100644..100755
--- a/library/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
index d57df98..d57df98 100644..100755
--- a/library/res/drawable-hdpi/abs__tab_selected_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
index 6278eef..6278eef 100644..100755
--- a/library/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
index aadc6f8..aadc6f8 100644..100755
--- a/library/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
new file mode 100755
index 0000000..70c0e73
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
new file mode 100755
index 0000000..36e71d8
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
new file mode 100755
index 0000000..4be4af5
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
new file mode 100755
index 0000000..e72193f
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
new file mode 100755
index 0000000..8f20b9d
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
new file mode 100755
index 0000000..04f657e
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
new file mode 100755
index 0000000..99309ef
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
new file mode 100755
index 0000000..9bde7fb
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-hdpi/abs__toast_frame.9.png b/actionbarsherlock/res/drawable-hdpi/abs__toast_frame.9.png
new file mode 100755
index 0000000..ad2cb5a
--- /dev/null
+++ b/actionbarsherlock/res/drawable-hdpi/abs__toast_frame.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
index b229367..b229367 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
index c65f443..c65f443 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
index 0706c8a..0706c8a 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
index d814d02..d814d02 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
index b139c8e..b139c8e 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
index ed4ba34..738cb38 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
new file mode 100755
index 0000000..2ed75a7
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
index 743d00b..743d00b 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
index 17c1fb9..17c1fb9 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
index ddfc8e3..ddfc8e3 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
index 007a4b2..007a4b2 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
index ad6e1a4..ad6e1a4 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 0ad6c88..0ad6c88 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
index 19b50ab..19b50ab 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
index ad980b1..ad980b1 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
index 60e6c52..60e6c52 100644..100755
--- a/library/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
index 5461b9c..5461b9c 100644..100755
--- a/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
index 5dc6f80..5dc6f80 100644..100755
--- a/library/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
index a70b53c..a70b53c 100644..100755
--- a/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
index c7a9896..c7a9896 100644..100755
--- a/library/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 85d7aad..85d7aad 100644..100755
--- a/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
index f7b01e0..f7b01e0 100644..100755
--- a/library/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
index d8f1c8b..d8f1c8b 100644..100755
--- a/library/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
index 31e4989..31e4989 100644..100755
--- a/library/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
index 7c2cbe5..7c2cbe5 100644..100755
--- a/library/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
index 30cbdc1..30cbdc1 100644..100755
--- a/library/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
index df2d3d1..df2d3d1 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png
diff --git a/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
index b2aa9c2..b2aa9c2 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png
diff --git a/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
index a17b6a7..a17b6a7 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png
diff --git a/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
index b28b3b5..b28b3b5 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_disabled.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
new file mode 100755
index 0000000..79228ba
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_disabled.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_normal.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_normal.png
new file mode 100755
index 0000000..86944a8
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_normal.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
new file mode 100755
index 0000000..c0bdf06
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
new file mode 100755
index 0000000..15b86cb
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png
new file mode 100755
index 0000000..844c99c
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png
new file mode 100755
index 0000000..86c170e
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_go.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_go.png
new file mode 100755
index 0000000..bf19833
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_go.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
new file mode 100755
index 0000000..8518498
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png
diff --git a/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index ba704b6..ba704b6 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index 01d6816..01d6816 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
index 6bf21e3..6bf21e3 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png
diff --git a/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
index 70fe31a..70fe31a 100644..100755
--- a/library/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_search.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_search.png
new file mode 100755
index 0000000..4be72f1
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_search.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
new file mode 100755
index 0000000..f2e26f8
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_voice_search.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_voice_search.png
new file mode 100755
index 0000000..73c6be6
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_voice_search.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
new file mode 100755
index 0000000..71d838e
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/library/res/drawable-mdpi/abs__list_activated_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
index 3bf8e03..3bf8e03 100644..100755
--- a/library/res/drawable-mdpi/abs__list_activated_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_activated_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
index 986ab0b..986ab0b 100644..100755
--- a/library/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
index 0279e17..0279e17 100644..100755
--- a/library/res/drawable-mdpi/abs__list_divider_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__list_focused_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
index 7c0599e..7c0599e 100644..100755
--- a/library/res/drawable-mdpi/abs__list_focused_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_focused_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
index 3bf8e03..3bf8e03 100644..100755
--- a/library/res/drawable-mdpi/abs__list_longpressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
index 6e77525..6e77525 100644..100755
--- a/library/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
index 6e77525..6e77525 100644..100755
--- a/library/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
index 92da2f0..92da2f0 100644..100755
--- a/library/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
index 42cb646..42cb646 100644..100755
--- a/library/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
index 460ec46..460ec46 100644..100755
--- a/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
index e84adf2..e84adf2 100644..100755
--- a/library/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
index 3d946e5..3d946e5 100644..100755
--- a/library/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
index 4bb22f0..4bb22f0 100644..100755
--- a/library/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
index ab8ec69..ab8ec69 100644..100755
--- a/library/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
index ab8ec69..ab8ec69 100644..100755
--- a/library/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
index 7274274..7274274 100644..100755
--- a/library/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
index 7274274..7274274 100644..100755
--- a/library/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
index 9458668..9458668 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_48_inner_holo.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png
diff --git a/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
index 4ce73ed..4ce73ed 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_48_outer_holo.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
index 29aff4d..29aff4d 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
index 4055f70..4055f70 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
index ea4ee04..ea4ee04 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
index f74c02b..f74c02b 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
index 09a2992..09a2992 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
index 6536ee6..6536ee6 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 202b5b7..202b5b7 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
index 6de0ba8..6de0ba8 100644..100755
--- a/library/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
index c9972e7..c9972e7 100644..100755
--- a/library/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
index 587337c..587337c 100644..100755
--- a/library/res/drawable-mdpi/abs__tab_selected_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
index 155c4fc..155c4fc 100644..100755
--- a/library/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
index b1223fe..b1223fe 100644..100755
--- a/library/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
new file mode 100755
index 0000000..081657e
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
new file mode 100755
index 0000000..3f312b4
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
new file mode 100755
index 0000000..b086fae
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
new file mode 100755
index 0000000..73c336a
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
new file mode 100755
index 0000000..726e0ff
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
new file mode 100755
index 0000000..726e0ff
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
new file mode 100755
index 0000000..1767c16
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
new file mode 100755
index 0000000..1767c16
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-mdpi/abs__toast_frame.9.png b/actionbarsherlock/res/drawable-mdpi/abs__toast_frame.9.png
new file mode 100755
index 0000000..b9105de
--- /dev/null
+++ b/actionbarsherlock/res/drawable-mdpi/abs__toast_frame.9.png
diff --git a/library/res/drawable-v11/abs__progress_medium_holo.xml b/actionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
index 6bcbdb8..6bcbdb8 100644..100755
--- a/library/res/drawable-v11/abs__progress_medium_holo.xml
+++ b/actionbarsherlock/res/drawable-v11/abs__progress_medium_holo.xml
diff --git a/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
index 5753346..5753346 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
index 7e6c047..7e6c047 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
index 8155fe8..8155fe8 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
index 6cee9a1..6cee9a1 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
index fa4d76a..fa4d76a 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
index 55099d4..9a70a5d 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
index 3c4701f..14fbee1 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
index 6622cba..6622cba 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
index c427297..c427297 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
index d0df29d..d0df29d 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
index a0d9c1b..a0d9c1b 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
index d36f99f..d36f99f 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
index 5ad475d..5ad475d 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
index 6ade5ee..6ade5ee 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
index 719b923..719b923 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
index 6da264d..6da264d 100644..100755
--- a/library/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
index 7ef2db7..7ef2db7 100644..100755
--- a/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
index 2283b4c..2283b4c 100644..100755
--- a/library/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
index 6d2039e..6d2039e 100644..100755
--- a/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
index 3c909b5..3c909b5 100644..100755
--- a/library/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
index 131d103..131d103 100644..100755
--- a/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
index 3e7dcdf..3e7dcdf 100644..100755
--- a/library/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
index 0bd0980..0bd0980 100644..100755
--- a/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
index 43ed26d..43ed26d 100644..100755
--- a/library/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
index 6b31579..6b31579 100644..100755
--- a/library/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
index df0121b..df0121b 100644..100755
--- a/library/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
index 8ded62f..8ded62f 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png
diff --git a/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
index 517e9f7..517e9f7 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png
diff --git a/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
index 2e06dd0..2e06dd0 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png
diff --git a/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
index bb19810..bb19810 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
new file mode 100755
index 0000000..e35c5f0
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
new file mode 100755
index 0000000..7fd7aeb
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
new file mode 100755
index 0000000..53cfbd3
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png
new file mode 100755
index 0000000..d8faf90
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png
new file mode 100755
index 0000000..e7c7280
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_go.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_go.png
new file mode 100755
index 0000000..1e2dcfa
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_go.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
new file mode 100755
index 0000000..f12eafc
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png
diff --git a/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
index a92fb1d..a92fb1d 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png
diff --git a/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
index 930ca8d..930ca8d 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png
diff --git a/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
index 45a0f1d..45a0f1d 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png
diff --git a/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
index 528e554..528e554 100644..100755
--- a/library/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_search.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_search.png
new file mode 100755
index 0000000..998f91b
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_search.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
new file mode 100755
index 0000000..a4cdf1c
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_voice_search.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_voice_search.png
new file mode 100755
index 0000000..c625a36
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_voice_search.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/actionbarsherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
new file mode 100755
index 0000000..c332ba0
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png
diff --git a/library/res/drawable-xhdpi/abs__list_activated_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
index eda10e6..eda10e6 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_activated_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
index e62f011..e62f011 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
index 65061c0..65061c0 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_focused_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
index 690cb1e..690cb1e 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_focused_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
index eda10e6..eda10e6 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
index e4b3393..e4b3393 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
index e4b3393..e4b3393 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
index 88726b6..88726b6 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
index c6a7d4d..c6a7d4d 100644..100755
--- a/library/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
index e2aff72..e2aff72 100644..100755
--- a/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
index 93066c8..93066c8 100644..100755
--- a/library/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
index 345f5d3..345f5d3 100644..100755
--- a/library/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
index c843ef3..c843ef3 100644..100755
--- a/library/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
index c6c3f1e..c6c3f1e 100644..100755
--- a/library/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
index c6c3f1e..c6c3f1e 100644..100755
--- a/library/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
index 205b66e..205b66e 100644..100755
--- a/library/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
index 205b66e..205b66e 100644..100755
--- a/library/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
index 19517c4..19517c4 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
index 14143c5..14143c5 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
index d8929fc..d8929fc 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
index 9174c4e..9174c4e 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
index 3015d30..3015d30 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
index 126637d..126637d 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
index d45c7a8..d45c7a8 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
index 29036b9..29036b9 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
index 2cb34d7..2cb34d7 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png
diff --git a/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
index 82f752f..82f752f 100644..100755
--- a/library/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png
diff --git a/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
index 03cfb09..03cfb09 100644..100755
--- a/library/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
index e4229f2..e4229f2 100644..100755
--- a/library/res/drawable-xhdpi/abs__tab_selected_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
index e862cb1..e862cb1 100644..100755
--- a/library/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png
diff --git a/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
index f1eb673..f1eb673 100644..100755
--- a/library/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
new file mode 100755
index 0000000..8fdbbf3
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
new file mode 100755
index 0000000..4e9ae43
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
new file mode 100755
index 0000000..98f4871
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
new file mode 100755
index 0000000..733373e
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
new file mode 100755
index 0000000..0c6bb03
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
new file mode 100755
index 0000000..0c6bb03
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
new file mode 100755
index 0000000..e5bfd8a
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
new file mode 100755
index 0000000..1743da6
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png
diff --git a/actionbarsherlock/res/drawable-xhdpi/abs__toast_frame.9.png b/actionbarsherlock/res/drawable-xhdpi/abs__toast_frame.9.png
new file mode 100755
index 0000000..9f39a77
--- /dev/null
+++ b/actionbarsherlock/res/drawable-xhdpi/abs__toast_frame.9.png
diff --git a/library/res/drawable/abs__activated_background_holo_dark.xml b/actionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
index 85c2c02..85c2c02 100644..100755
--- a/library/res/drawable/abs__activated_background_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__activated_background_holo_dark.xml
diff --git a/library/res/drawable/abs__activated_background_holo_light.xml b/actionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
index 85c2c02..85c2c02 100644..100755
--- a/library/res/drawable/abs__activated_background_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__activated_background_holo_light.xml
diff --git a/library/res/drawable/abs__btn_cab_done_holo_dark.xml b/actionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
index cab8962..cab8962 100644..100755
--- a/library/res/drawable/abs__btn_cab_done_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__btn_cab_done_holo_dark.xml
diff --git a/library/res/drawable/abs__btn_cab_done_holo_light.xml b/actionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
index 42ba8a0..42ba8a0 100644..100755
--- a/library/res/drawable/abs__btn_cab_done_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__btn_cab_done_holo_light.xml
diff --git a/actionbarsherlock/res/drawable/abs__ic_clear.xml b/actionbarsherlock/res/drawable/abs__ic_clear.xml
new file mode 100755
index 0000000..a16f4b2
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__ic_clear.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:drawable="@drawable/abs__ic_clear_disabled" />
+    <item
+         android:drawable="@drawable/abs__ic_clear_normal" />
+</selector>
diff --git a/actionbarsherlock/res/drawable/abs__ic_clear_holo_light.xml b/actionbarsherlock/res/drawable/abs__ic_clear_holo_light.xml
new file mode 100755
index 0000000..256de80
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__ic_clear_holo_light.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:drawable="@drawable/abs__ic_clear_search_api_disabled_holo_light" />
+    <item
+         android:drawable="@drawable/abs__ic_clear_search_api_holo_light" />
+</selector>
diff --git a/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml b/actionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
index 2588a49..2588a49 100644..100755
--- a/library/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml
diff --git a/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml b/actionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
index e2078c9..e2078c9 100644..100755
--- a/library/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml
diff --git a/library/res/drawable/abs__item_background_holo_dark.xml b/actionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
index d99b7a4..d99b7a4 100644..100755
--- a/library/res/drawable/abs__item_background_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__item_background_holo_dark.xml
diff --git a/library/res/drawable/abs__item_background_holo_light.xml b/actionbarsherlock/res/drawable/abs__item_background_holo_light.xml
index da5fb2e..da5fb2e 100644..100755
--- a/library/res/drawable/abs__item_background_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__item_background_holo_light.xml
diff --git a/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml b/actionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
index b2ce4f0..b2ce4f0 100644..100755
--- a/library/res/drawable/abs__list_selector_background_transition_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml
diff --git a/library/res/drawable/abs__list_selector_background_transition_holo_light.xml b/actionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
index d7e31b1..d7e31b1 100644..100755
--- a/library/res/drawable/abs__list_selector_background_transition_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml
diff --git a/library/res/drawable/abs__list_selector_holo_dark.xml b/actionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
index 08b8b12..08b8b12 100644..100755
--- a/library/res/drawable/abs__list_selector_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__list_selector_holo_dark.xml
diff --git a/library/res/drawable/abs__list_selector_holo_light.xml b/actionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
index ada490b..ada490b 100644..100755
--- a/library/res/drawable/abs__list_selector_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__list_selector_holo_light.xml
diff --git a/library/res/drawable/abs__progress_horizontal_holo_dark.xml b/actionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
index bd19140..bd19140 100644..100755
--- a/library/res/drawable/abs__progress_horizontal_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__progress_horizontal_holo_dark.xml
diff --git a/library/res/drawable/abs__progress_horizontal_holo_light.xml b/actionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
index 321f07c..321f07c 100644..100755
--- a/library/res/drawable/abs__progress_horizontal_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__progress_horizontal_holo_light.xml
diff --git a/library/res/drawable/abs__progress_medium_holo.xml b/actionbarsherlock/res/drawable/abs__progress_medium_holo.xml
index 6d4814f..6d4814f 100644..100755
--- a/library/res/drawable/abs__progress_medium_holo.xml
+++ b/actionbarsherlock/res/drawable/abs__progress_medium_holo.xml
diff --git a/actionbarsherlock/res/drawable/abs__search_dropdown_dark.xml b/actionbarsherlock/res/drawable/abs__search_dropdown_dark.xml
new file mode 100755
index 0000000..2628418
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__search_dropdown_dark.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F0A0A0A0"/>
+    <stroke android:width="2dp" color="#A00080FF"/>
+    <padding android:left="5dp" android:top="0dp"
+        android:right="5dp" android:bottom="1dp" />
+</shape>
diff --git a/actionbarsherlock/res/drawable/abs__search_dropdown_light.xml b/actionbarsherlock/res/drawable/abs__search_dropdown_light.xml
new file mode 100755
index 0000000..0d00c58
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__search_dropdown_light.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F0FFFFFF"/>
+    <stroke android:width="1dp" color="#A00080FF"/>
+    <padding android:left="5dp" android:top="0dp"
+        android:right="5dp" android:bottom="1dp" />
+</shape>
diff --git a/library/res/drawable/abs__spinner_ab_holo_dark.xml b/actionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
index 4af5e22..4af5e22 100644..100755
--- a/library/res/drawable/abs__spinner_ab_holo_dark.xml
+++ b/actionbarsherlock/res/drawable/abs__spinner_ab_holo_dark.xml
diff --git a/library/res/drawable/abs__spinner_ab_holo_light.xml b/actionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
index b785084..b785084 100644..100755
--- a/library/res/drawable/abs__spinner_ab_holo_light.xml
+++ b/actionbarsherlock/res/drawable/abs__spinner_ab_holo_light.xml
diff --git a/library/res/drawable/abs__tab_indicator_ab_holo.xml b/actionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
index d34e208..d34e208 100644..100755
--- a/library/res/drawable/abs__tab_indicator_ab_holo.xml
+++ b/actionbarsherlock/res/drawable/abs__tab_indicator_ab_holo.xml
diff --git a/actionbarsherlock/res/drawable/abs__textfield_searchview_holo_dark.xml b/actionbarsherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
new file mode 100755
index 0000000..b6d58c0
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__textfield_searchview_holo_dark.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+        android:drawable="@drawable/abs__textfield_search_selected_holo_dark" />
+    <item android:drawable="@drawable/abs__textfield_search_default_holo_dark" />
+</selector>
+
diff --git a/actionbarsherlock/res/drawable/abs__textfield_searchview_holo_light.xml b/actionbarsherlock/res/drawable/abs__textfield_searchview_holo_light.xml
new file mode 100755
index 0000000..3d6acf8
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__textfield_searchview_holo_light.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+        android:drawable="@drawable/abs__textfield_search_selected_holo_light" />
+    <item android:drawable="@drawable/abs__textfield_search_default_holo_light" />
+</selector>
+
diff --git a/actionbarsherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml b/actionbarsherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
new file mode 100755
index 0000000..05ff4ed
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+        android:drawable="@drawable/abs__textfield_search_right_selected_holo_dark" />
+    <item android:drawable="@drawable/abs__textfield_search_right_default_holo_dark" />
+</selector>
+
diff --git a/actionbarsherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml b/actionbarsherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
new file mode 100755
index 0000000..f6d61e5
--- /dev/null
+++ b/actionbarsherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+        android:drawable="@drawable/abs__textfield_search_right_selected_holo_light" />
+    <item android:drawable="@drawable/abs__textfield_search_right_default_holo_light" />
+</selector>
+
diff --git a/library/res/layout-large/abs__action_mode_close_item.xml b/actionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
index 8811dad..8811dad 100644..100755
--- a/library/res/layout-large/abs__action_mode_close_item.xml
+++ b/actionbarsherlock/res/layout-large/abs__action_mode_close_item.xml
diff --git a/library/res/layout-v14/sherlock_spinner_dropdown_item.xml b/actionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
index 6c183c0..6c183c0 100644..100755
--- a/library/res/layout-v14/sherlock_spinner_dropdown_item.xml
+++ b/actionbarsherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml
diff --git a/library/res/layout-v14/sherlock_spinner_item.xml b/actionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
index 61dc025..61dc025 100644..100755
--- a/library/res/layout-v14/sherlock_spinner_item.xml
+++ b/actionbarsherlock/res/layout-v14/sherlock_spinner_item.xml
diff --git a/library/res/layout-xlarge/abs__screen_action_bar.xml b/actionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
index 040df44..ab4fa28 100644..100755
--- a/library/res/layout-xlarge/abs__screen_action_bar.xml
+++ b/actionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
@@ -21,6 +21,7 @@ This is an optimized layout for a screen with the Action Bar enabled.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:fitsSystemWindows="true"
+    android:splitMotionEvents="false"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
     <com.actionbarsherlock.internal.widget.ActionBarContainer
diff --git a/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/actionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
index c64ef14..0ab3ae6 100644..100755
--- a/library/res/layout-xlarge/abs__screen_action_bar_overlay.xml
+++ b/actionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
@@ -20,7 +20,8 @@ the Action Bar enabled overlaying application content.
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:splitMotionEvents="false">
     <com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout android:id="@+id/abs__content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
diff --git a/library/res/layout/abs__action_bar_home.xml b/actionbarsherlock/res/layout/abs__action_bar_home.xml
index 5c1e9ec..5c1e9ec 100644..100755
--- a/library/res/layout/abs__action_bar_home.xml
+++ b/actionbarsherlock/res/layout/abs__action_bar_home.xml
diff --git a/library/res/layout/abs__action_bar_tab.xml b/actionbarsherlock/res/layout/abs__action_bar_tab.xml
index f46f7a0..f46f7a0 100644..100755
--- a/library/res/layout/abs__action_bar_tab.xml
+++ b/actionbarsherlock/res/layout/abs__action_bar_tab.xml
diff --git a/library/res/layout/abs__action_bar_tab_bar_view.xml b/actionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
index 0d51220..9d8f759 100644..100755
--- a/library/res/layout/abs__action_bar_tab_bar_view.xml
+++ b/actionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<com.actionbarsherlock.internal.widget.IcsLinearLayout
+<com.actionbarsherlock.internal.widget.TabsLinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     style="?attr/actionBarTabBarStyle"
-/>
\ No newline at end of file
+/>
diff --git a/library/res/layout/abs__action_bar_title_item.xml b/actionbarsherlock/res/layout/abs__action_bar_title_item.xml
index dd69aca..dd69aca 100644..100755
--- a/library/res/layout/abs__action_bar_title_item.xml
+++ b/actionbarsherlock/res/layout/abs__action_bar_title_item.xml
diff --git a/library/res/layout/abs__action_menu_item_layout.xml b/actionbarsherlock/res/layout/abs__action_menu_item_layout.xml
index 13149fd..13149fd 100644..100755
--- a/library/res/layout/abs__action_menu_item_layout.xml
+++ b/actionbarsherlock/res/layout/abs__action_menu_item_layout.xml
diff --git a/library/res/layout/abs__action_menu_layout.xml b/actionbarsherlock/res/layout/abs__action_menu_layout.xml
index a6f8e53..a6f8e53 100644..100755
--- a/library/res/layout/abs__action_menu_layout.xml
+++ b/actionbarsherlock/res/layout/abs__action_menu_layout.xml
diff --git a/library/res/layout/abs__action_mode_bar.xml b/actionbarsherlock/res/layout/abs__action_mode_bar.xml
index 7168dc7..7168dc7 100644..100755
--- a/library/res/layout/abs__action_mode_bar.xml
+++ b/actionbarsherlock/res/layout/abs__action_mode_bar.xml
diff --git a/library/res/layout/abs__action_mode_close_item.xml b/actionbarsherlock/res/layout/abs__action_mode_close_item.xml
index 875ec3e..875ec3e 100644..100755
--- a/library/res/layout/abs__action_mode_close_item.xml
+++ b/actionbarsherlock/res/layout/abs__action_mode_close_item.xml
diff --git a/library/res/layout/abs__activity_chooser_view.xml b/actionbarsherlock/res/layout/abs__activity_chooser_view.xml
index 019d14e..6a0ac9e 100644..100755
--- a/library/res/layout/abs__activity_chooser_view.xml
+++ b/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/library/res/layout/abs__activity_chooser_view_list_item.xml b/actionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
index b430032..b430032 100644..100755
--- a/library/res/layout/abs__activity_chooser_view_list_item.xml
+++ b/actionbarsherlock/res/layout/abs__activity_chooser_view_list_item.xml
diff --git a/library/res/layout/abs__list_menu_item_checkbox.xml b/actionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
index 39aca3a..39aca3a 100644..100755
--- a/library/res/layout/abs__list_menu_item_checkbox.xml
+++ b/actionbarsherlock/res/layout/abs__list_menu_item_checkbox.xml
diff --git a/library/res/layout/abs__list_menu_item_icon.xml b/actionbarsherlock/res/layout/abs__list_menu_item_icon.xml
index 55ab28a..55ab28a 100644..100755
--- a/library/res/layout/abs__list_menu_item_icon.xml
+++ b/actionbarsherlock/res/layout/abs__list_menu_item_icon.xml
diff --git a/library/res/layout/abs__list_menu_item_radio.xml b/actionbarsherlock/res/layout/abs__list_menu_item_radio.xml
index ff54bbe..ff54bbe 100644..100755
--- a/library/res/layout/abs__list_menu_item_radio.xml
+++ b/actionbarsherlock/res/layout/abs__list_menu_item_radio.xml
diff --git a/library/res/layout/abs__popup_menu_item_layout.xml b/actionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
index d42425a..d42425a 100644..100755
--- a/library/res/layout/abs__popup_menu_item_layout.xml
+++ b/actionbarsherlock/res/layout/abs__popup_menu_item_layout.xml
diff --git a/library/res/layout/abs__screen_action_bar.xml b/actionbarsherlock/res/layout/abs__screen_action_bar.xml
index 1fb82fe..68dc7df 100644..100755
--- a/library/res/layout/abs__screen_action_bar.xml
+++ b/actionbarsherlock/res/layout/abs__screen_action_bar.xml
@@ -22,7 +22,8 @@ This is an optimized layout for a screen with the Action Bar enabled.
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:splitMotionEvents="false">
     <com.actionbarsherlock.internal.widget.ActionBarContainer
         android:id="@+id/abs__action_bar_container"
         android:layout_width="fill_parent"
diff --git a/library/res/layout/abs__screen_action_bar_overlay.xml b/actionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
index 0961ef5..45cd723 100644..100755
--- a/library/res/layout/abs__screen_action_bar_overlay.xml
+++ b/actionbarsherlock/res/layout/abs__screen_action_bar_overlay.xml
@@ -22,7 +22,8 @@ the Action Bar enabled overlaying application content.
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:fitsSystemWindows="true"
+    android:splitMotionEvents="false">
     <com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout android:id="@+id/abs__content"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/library/res/layout/abs__screen_simple.xml b/actionbarsherlock/res/layout/abs__screen_simple.xml
index 33e2dea..33e2dea 100644..100755
--- a/library/res/layout/abs__screen_simple.xml
+++ b/actionbarsherlock/res/layout/abs__screen_simple.xml
diff --git a/library/res/layout/abs__screen_simple_overlay_action_mode.xml b/actionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
index f8b9fb1..f8b9fb1 100644..100755
--- a/library/res/layout/abs__screen_simple_overlay_action_mode.xml
+++ b/actionbarsherlock/res/layout/abs__screen_simple_overlay_action_mode.xml
diff --git a/actionbarsherlock/res/layout/abs__search_dropdown_item_icons_2line.xml b/actionbarsherlock/res/layout/abs__search_dropdown_item_icons_2line.xml
new file mode 100755
index 0000000..e1d3dc4
--- /dev/null
+++ b/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/actionbarsherlock/res/layout/abs__search_view.xml b/actionbarsherlock/res/layout/abs__search_view.xml
new file mode 100755
index 0000000..6ba3191
--- /dev/null
+++ b/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/actionbarsherlock/res/layout/abs__simple_dropdown_hint.xml b/actionbarsherlock/res/layout/abs__simple_dropdown_hint.xml
new file mode 100755
index 0000000..0088e14
--- /dev/null
+++ b/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="?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" />
diff --git a/library/res/layout/sherlock_spinner_dropdown_item.xml b/actionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
index a6c6252..a6c6252 100644..100755
--- a/library/res/layout/sherlock_spinner_dropdown_item.xml
+++ b/actionbarsherlock/res/layout/sherlock_spinner_dropdown_item.xml
diff --git a/library/res/layout/sherlock_spinner_item.xml b/actionbarsherlock/res/layout/sherlock_spinner_item.xml
index bea7401..bea7401 100644..100755
--- a/library/res/layout/sherlock_spinner_item.xml
+++ b/actionbarsherlock/res/layout/sherlock_spinner_item.xml
diff --git a/library/res/values-land/abs__dimens.xml b/actionbarsherlock/res/values-land/abs__dimens.xml
index 502cc16..502cc16 100644..100755
--- a/library/res/values-land/abs__dimens.xml
+++ b/actionbarsherlock/res/values-land/abs__dimens.xml
diff --git a/library/res/values-large-hdpi-1024x600/abs__dimens.xml b/actionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
index 3312cfa..3312cfa 100644..100755
--- a/library/res/values-large-hdpi-1024x600/abs__dimens.xml
+++ b/actionbarsherlock/res/values-large-hdpi-1024x600/abs__dimens.xml
diff --git a/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml b/actionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
index 502cc16..502cc16 100644..100755
--- a/library/res/values-large-land-hdpi-1024x600/abs__dimens.xml
+++ b/actionbarsherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml
diff --git a/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml b/actionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
index 3312cfa..3312cfa 100644..100755
--- a/library/res/values-large-land-mdpi-1024x600/abs__dimens.xml
+++ b/actionbarsherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml
diff --git a/library/res/values-large-mdpi-1024x600/abs__dimens.xml b/actionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
index 3591033..d3a64c7 100644..100755
--- a/library/res/values-large-mdpi-1024x600/abs__dimens.xml
+++ b/actionbarsherlock/res/values-large-mdpi-1024x600/abs__dimens.xml
@@ -32,5 +32,5 @@
     <dimen name="abs__action_bar_subtitle_bottom_margin">9dip</dimen>
 
     <!-- Minimum width for an action button in the menu area of an action bar -->
-    <dimen name="action_button_min_width">64dip</dimen>
+    <dimen name="abs__action_button_min_width">64dip</dimen>
 </resources>
diff --git a/library/res/values-sw600dp/abs__bools.xml b/actionbarsherlock/res/values-sw600dp/abs__bools.xml
index 7a48e15..7a48e15 100644..100755
--- a/library/res/values-sw600dp/abs__bools.xml
+++ b/actionbarsherlock/res/values-sw600dp/abs__bools.xml
diff --git a/library/res/values-sw600dp/abs__dimens.xml b/actionbarsherlock/res/values-sw600dp/abs__dimens.xml
index f678538..175a47f 100644..100755
--- a/library/res/values-sw600dp/abs__dimens.xml
+++ b/actionbarsherlock/res/values-sw600dp/abs__dimens.xml
@@ -34,5 +34,5 @@
     <integer name="abs__max_action_buttons">5</integer>
 
     <!-- Minimum width for an action button in the menu area of an action bar -->
-    <dimen name="action_button_min_width">64dip</dimen>
+    <dimen name="abs__action_button_min_width">64dip</dimen>
 </resources>
diff --git a/library/res/values-v11/abs__themes.xml b/actionbarsherlock/res/values-v11/abs__themes.xml
index 0347357..0347357 100644..100755
--- a/library/res/values-v11/abs__themes.xml
+++ b/actionbarsherlock/res/values-v11/abs__themes.xml
diff --git a/library/res/values-v14/abs__styles.xml b/actionbarsherlock/res/values-v14/abs__styles.xml
index f2aa64d..88a60dd 100644..100755
--- a/library/res/values-v14/abs__styles.xml
+++ b/actionbarsherlock/res/values-v14/abs__styles.xml
@@ -85,6 +85,11 @@
     <style name="Widget.Sherlock.Light.ProgressBar.Horizontal" parent="android:Widget.Holo.Light.ProgressBar.Horizontal">
     </style>
 
+    <style name="Widget.Sherlock.SearchAutoCompleteTextView" parent="android:Widget.Holo.AutoCompleteTextView">
+    </style>
+    <style name="Widget.Sherlock.Light.SearchAutoCompleteTextView" parent="android:Widget.Holo.Light.AutoCompleteTextView">
+    </style>
+
     <style name="TextAppearance.Sherlock.Widget.ActionBar.Menu" parent="android:TextAppearance.Holo.Widget.ActionBar.Menu">
     </style>
 
diff --git a/library/res/values-v14/abs__themes.xml b/actionbarsherlock/res/values-v14/abs__themes.xml
index ceb9607..75e317b 100644..100755
--- a/library/res/values-v14/abs__themes.xml
+++ b/actionbarsherlock/res/values-v14/abs__themes.xml
@@ -10,10 +10,12 @@
         <item name="actionBarSize">?android:attr/actionBarSize</item>
         <!-- Needed for our bug-fix dropdown list navigation layout. :( -->
         <item name="dropdownListPreferredItemHeight">48dp</item>
-        <!-- Needed for our ShareActionProvider implementation. -->
+        <!-- Needed for our ShareActionProvider and SearchView implementation. -->
         <item name="android:actionBarWidgetTheme">@style/Theme.Sherlock</item>
         <!-- For crazy people who use IcsSpinner. -->
         <item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item>
+        <!-- Needed for our SearchView implementation. -->
+        <item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
     </style>
 
     <style name="Theme.Sherlock.NoActionBar">
@@ -24,9 +26,4 @@
       <item name="android:windowActionBar">false</item>
       <item name="android:windowNoTitle">true</item>
     </style>
-
-    <style name="Theme.Sherlock.Dialog" parent="android:Theme.Holo.Dialog">
-    </style>
-    <style name="Theme.Sherlock.Light.Dialog" parent="android:Theme.Holo.Light.Dialog">
-    </style>
 </resources>
diff --git a/library/res/values-w360dp/abs__dimens.xml b/actionbarsherlock/res/values-w360dp/abs__dimens.xml
index 6f49d7e..6f49d7e 100644..100755
--- a/library/res/values-w360dp/abs__dimens.xml
+++ b/actionbarsherlock/res/values-w360dp/abs__dimens.xml
diff --git a/library/res/values-w480dp/abs__bools.xml b/actionbarsherlock/res/values-w480dp/abs__bools.xml
index 3eaf4ae..3eaf4ae 100644..100755
--- a/library/res/values-w480dp/abs__bools.xml
+++ b/actionbarsherlock/res/values-w480dp/abs__bools.xml
diff --git a/library/res/values-w480dp/abs__config.xml b/actionbarsherlock/res/values-w480dp/abs__config.xml
index 88357b0..88357b0 100644..100755
--- a/library/res/values-w480dp/abs__config.xml
+++ b/actionbarsherlock/res/values-w480dp/abs__config.xml
diff --git a/library/res/values-w500dp/abs__dimens.xml b/actionbarsherlock/res/values-w500dp/abs__dimens.xml
index 2fd4dee..2fd4dee 100644..100755
--- a/library/res/values-w500dp/abs__dimens.xml
+++ b/actionbarsherlock/res/values-w500dp/abs__dimens.xml
diff --git a/library/res/values-w600dp/abs__dimens.xml b/actionbarsherlock/res/values-w600dp/abs__dimens.xml
index b085952..b085952 100644..100755
--- a/library/res/values-w600dp/abs__dimens.xml
+++ b/actionbarsherlock/res/values-w600dp/abs__dimens.xml
diff --git a/library/res/values-xlarge/abs__dimens.xml b/actionbarsherlock/res/values-xlarge/abs__dimens.xml
index bfc535d..bfc535d 100644..100755
--- a/library/res/values-xlarge/abs__dimens.xml
+++ b/actionbarsherlock/res/values-xlarge/abs__dimens.xml
diff --git a/library/res/values/abs__attrs.xml b/actionbarsherlock/res/values/abs__attrs.xml
index 81c3471..af5873d 100644..100755
--- a/library/res/values/abs__attrs.xml
+++ b/actionbarsherlock/res/values/abs__attrs.xml
@@ -74,6 +74,9 @@
         <!-- Small Button style. -->
         <attr name="buttonStyleSmall" format="reference" />
 
+        <!-- Background drawable for standalone items that need focus/pressed states. -->
+        <attr name="selectableItemBackground" format="reference" />
+
 
 
         <!-- This Drawable is overlaid over the foreground of the Window's content area, usually
@@ -97,6 +100,40 @@
         <attr name="spinnerItemStyle" format="reference" />
         <attr name="spinnerDropDownItemStyle" format="reference" />
 
+        <!-- ============================ -->
+        <!-- SearchView styles and assets -->
+        <!-- ============================ -->
+        <eat-comment />
+        <!-- SearchView AutoCompleteTextView style -->
+        <attr name="searchAutoCompleteTextView" format="reference" />
+        <!-- SearchView dropdown background -->
+        <attr name="searchDropdownBackground" format="reference" />
+        <!-- SearchView close button icon -->
+        <attr name="searchViewCloseIcon" format="reference" />
+        <!-- SearchView Go button icon -->
+        <attr name="searchViewGoIcon" format="reference" />
+        <!-- SearchView Search icon -->
+        <attr name="searchViewSearchIcon" format="reference" />
+        <!-- SearchView Voice button icon -->
+        <attr name="searchViewVoiceIcon" format="reference" />
+        <!-- SearchView query refinement icon -->
+        <attr name="searchViewEditQuery" format="reference" />
+        <!-- SearchView query refinement icon background -->
+        <attr name="searchViewEditQueryBackground" format="reference" />
+        <!-- SearchView text field background for the left section -->
+        <attr name="searchViewTextField" format="reference" />
+        <!-- SearchView text field background for the right section -->
+        <attr name="searchViewTextFieldRight" format="reference" />
+        <!-- Text color for urls in search suggestions, used by things like global search and the browser. @hide -->
+        <attr name="textColorSearchUrl" format="reference|color" />
+        <!-- The list item height for search results. @hide -->
+        <attr name="searchResultListItemHeight" format="dimension" />
+        <!-- Text color, typeface, size, and style for system search result title. Defaults to primary inverse text color. -->
+        <attr name="textAppearanceSearchResultTitle" format="reference" />
+        <!-- Text color, typeface, size, and style for system search result subtitle. Defaults to primary inverse text color. -->
+        <attr name="textAppearanceSearchResultSubtitle" format="reference" />
+
+
         <!-- =========== -->
         <!-- List styles -->
         <!-- =========== -->
@@ -144,10 +181,7 @@
         <!-- Drawable used as a background for activated items. -->
         <attr name="activatedBackgroundIndicator" format="reference" />
 
-        <!-- Specified if we are forcing an action item overflow menu. -->
-        <attr name="absForceOverflow" format="boolean" />
-
-        <attr name="android:windowIsFloating" />
+        <attr name="dropDownHintAppearance" format="reference" />
     </declare-styleable>
 
 
@@ -377,4 +411,22 @@
         <!-- Gravity setting for positioning the currently selected item. -->
         <attr name="android:gravity" />
     </declare-styleable>
+
+    <declare-styleable name="SherlockSearchView">
+        <!-- The default state of the SearchView. If true, it will be iconified when not in
+             use and expanded when clicked. -->
+        <attr name="iconifiedByDefault" format="boolean"/>
+        <!-- An optional maximum width of the SearchView. -->
+        <attr name="android:maxWidth" />
+        <!-- An optional query hint string to be displayed in the empty query field. -->
+        <attr name="queryHint" format="string" />
+        <!-- The IME options to set on the query text field. -->
+        <attr name="android:imeOptions" />
+        <!-- The input type to set on the query text field. -->
+        <attr name="android:inputType" />
+    </declare-styleable>
+
+    <declare-styleable name="SherlockView">
+        <attr name="android:focusable"/>
+    </declare-styleable>
 </resources>
diff --git a/library/res/values/abs__bools.xml b/actionbarsherlock/res/values/abs__bools.xml
index 0b43244..0b43244 100644..100755
--- a/library/res/values/abs__bools.xml
+++ b/actionbarsherlock/res/values/abs__bools.xml
diff --git a/library/res/values/abs__colors.xml b/actionbarsherlock/res/values/abs__colors.xml
index 625c632..b189e72 100644..100755
--- a/library/res/values/abs__colors.xml
+++ b/actionbarsherlock/res/values/abs__colors.xml
@@ -21,7 +21,4 @@
     <color name="abs__bright_foreground_holo_light">@color/abs__background_holo_dark</color>
     <color name="abs__bright_foreground_disabled_holo_dark">#ff4c4c4c</color>
     <color name="abs__bright_foreground_disabled_holo_light">#ffb2b2b2</color>
-    <color name="abs__bright_foreground_inverse_holo_dark">@color/abs__bright_foreground_holo_light</color>
-    <color name="abs__bright_foreground_inverse_holo_light">@color/abs__bright_foreground_holo_dark</color>
-    <color name="abs__holo_blue_light">#ff33b5e5</color>
 </resources>
diff --git a/library/res/values/abs__config.xml b/actionbarsherlock/res/values/abs__config.xml
index 4c7b5d4..4c7b5d4 100644..100755
--- a/library/res/values/abs__config.xml
+++ b/actionbarsherlock/res/values/abs__config.xml
diff --git a/library/res/values/abs__dimens.xml b/actionbarsherlock/res/values/abs__dimens.xml
index 0a40975..9ded219 100644..100755
--- a/library/res/values/abs__dimens.xml
+++ b/actionbarsherlock/res/values/abs__dimens.xml
@@ -30,21 +30,26 @@
     <dimen name="abs__action_bar_subtitle_top_margin">-3dp</dimen>
     <!-- Bottom margin for action bar subtitles -->
     <dimen name="abs__action_bar_subtitle_bottom_margin">5dip</dimen>
-    
+
     <integer name="abs__max_action_buttons">2</integer>
 
     <!-- Minimum width for an action button in the menu area of an action bar -->
     <dimen name="abs__action_button_min_width">56dip</dimen>
-    
-    <!-- Dialog title height -->
-    <dimen name="abs__alert_dialog_title_height">64dip</dimen>
-    
-    <!-- The platform's desired minimum size for a dialog's width when it
-         is along the major axis (that is the screen is landscape).  This may
-         be either a fraction or a dimension. -->
-    <item type="dimen" name="abs__dialog_min_width_major">65%</item>
-    <!-- The platform's desired minimum size for a dialog's width when it
-         is along the minor axis (that is the screen is portrait).  This may
-         be either a fraction or a dimension. -->
-    <item type="dimen" name="abs__dialog_min_width_minor">95%</item>
+
+
+    <!-- Text padding for dropdown items -->
+    <dimen name="abs__dropdownitem_text_padding_left">8dip</dimen>
+
+    <!-- Text padding for dropdown items -->
+    <dimen name="abs__dropdownitem_text_padding_right">8dip</dimen>
+
+    <!-- Width of the icon in a dropdown list -->
+    <dimen name="abs__dropdownitem_icon_width">32dip</dimen>
+
+
+    <!-- Minimum width of the search view text entry area. -->
+    <dimen name="abs__search_view_text_min_width">160dip</dimen>
+
+    <!-- Preferred width of the search view. -->
+    <dimen name="abs__search_view_preferred_width">320dip</dimen>
 </resources>
diff --git a/library/res/values/abs__ids.xml b/actionbarsherlock/res/values/abs__ids.xml
index f9f5604..f9f5604 100644..100755
--- a/library/res/values/abs__ids.xml
+++ b/actionbarsherlock/res/values/abs__ids.xml
diff --git a/library/res/values/abs__strings.xml b/actionbarsherlock/res/values/abs__strings.xml
index 1e1c702..cf02359 100644..100755
--- a/library/res/values/abs__strings.xml
+++ b/actionbarsherlock/res/values/abs__strings.xml
@@ -29,14 +29,21 @@
 
     <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
     <string name="abs__activity_chooser_view_see_all">See all...</string>
-    <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
-    <string name="abs__activity_chooser_view_dialog_title_default">Select activity</string>
-    <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
-    <string name="abs__share_action_provider_share_with">Share with...</string>
     <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
     <string name="abs__activitychooserview_choose_application">Choose an application</string>
     <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
     <string name="abs__shareactionprovider_share_with">Share with</string>
     <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
     <string name="abs__shareactionprovider_share_with_application">Share with <xliff:g id="application_name" example="Bluetooth">%s</xliff:g></string>
+
+    <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+    <string name="abs__searchview_description_search">Search</string>
+    <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+    <string name="abs__searchview_description_query">Search query</string>
+    <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+    <string name="abs__searchview_description_clear">Clear query</string>
+    <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+    <string name="abs__searchview_description_submit">Submit query</string>
+    <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+    <string name="abs__searchview_description_voice">Voice search</string>
 </resources>
diff --git a/library/res/values/abs__styles.xml b/actionbarsherlock/res/values/abs__styles.xml
index 8cbd364..f86c1b8 100644..100755
--- a/library/res/values/abs__styles.xml
+++ b/actionbarsherlock/res/values/abs__styles.xml
@@ -182,6 +182,7 @@
         <item name="android:divider">?attr/dividerVertical</item>
         <item name="android:showDividers">middle</item>
         <item name="android:dividerPadding">6dip</item>
+        <item name="android:minHeight">?attr/actionBarSize</item>
     </style>
     <style name="Widget.Sherlock.ActivityChooserView" parent="Sherlock.__Widget.ActivityChooserView">
     </style>
@@ -279,21 +280,24 @@
 
 
 
-    <style name="DialogWindowTitle.Sherlock" parent="Widget">
-        <item name="android:maxLines">1</item>
-        <item name="android:scrollHorizontally">true</item>
-        <item name="android:textAppearance">@style/TextAppearance.Sherlock.DialogWindowTitle</item>
-        <item name="android:minHeight">@dimen/abs__alert_dialog_title_height</item>
-        <item name="android:paddingLeft">16dip</item>
-        <item name="android:paddingRight">16dip</item>
+    <style name="Sherlock.__Widget.SearchAutoCompleteTextView" parent="Widget">
+        <item name="android:focusable">true</item>
+        <item name="android:focusableInTouchMode">true</item>
+        <item name="android:clickable">true</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item>
+        <item name="android:textColor">?attr/textColorPrimary</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:completionHintView">@layout/abs__simple_dropdown_hint</item>
+        <item name="android:completionThreshold">2</item>
+        <item name="android:dropDownWidth">wrap_content</item>
     </style>
-    <style name="DialogWindowTitle.Sherlock.Light" parent="Widget">
-        <item name="android:maxLines">1</item>
-        <item name="android:scrollHorizontally">true</item>
-        <item name="android:textAppearance">@style/TextAppearance.Sherlock.Light.DialogWindowTitle</item>
-        <item name="android:minHeight">@dimen/abs__alert_dialog_title_height</item>
-        <item name="android:paddingLeft">16dip</item>
-        <item name="android:paddingRight">16dip</item>
+    <style name="Widget.Sherlock.SearchAutoCompleteTextView" parent="Sherlock.__Widget.SearchAutoCompleteTextView">
+        <item name="android:dropDownSelector">@drawable/abs__list_selector_holo_dark</item>
+        <item name="android:popupBackground">@drawable/abs__menu_dropdown_panel_holo_dark</item>
+    </style>
+    <style name="Widget.Sherlock.Light.SearchAutoCompleteTextView" parent="Sherlock.__Widget.SearchAutoCompleteTextView">
+        <item name="android:dropDownSelector">@drawable/abs__list_selector_holo_light</item>
+        <item name="android:popupBackground">@drawable/abs__menu_dropdown_panel_holo_light</item>
     </style>
 
 
@@ -364,15 +368,6 @@
         <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="TextAppearance.Sherlock.DialogWindowTitle" parent="Widget">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">@color/abs__holo_blue_light</item>
-    </style>
-    <style name="TextAppearance.Sherlock.Light.DialogWindowTitle" parent="Widget">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">@color/abs__holo_blue_light</item>
-    </style>
-
     <style name="Sherlock.__TextAppearance.Small" parent="Widget">
       <item name="android:textSize">14sp</item>
       <item name="android:textColor">?android:attr/textColorSecondary</item>
@@ -381,4 +376,37 @@
     </style>
     <style name="TextAppearance.Sherlock.Light.Small" parent="TextAppearance.Sherlock.Small">
     </style>
+
+    <style name="TextAppearance.Sherlock.Widget.DropDownHint" parent="Widget">
+        <item name="android:textColor">?textColorPrimary</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="TextAppearance.Sherlock" parent="@android:style/TextAppearance"/>
+
+    <style name="TextAppearance.Sherlock.SearchResult">
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textColorHint">?android:attr/textColorHint</item>
+    </style>
+
+    <style name="TextAppearance.Sherlock.SearchResult.Title">
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="TextAppearance.Sherlock.SearchResult.Subtitle">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <style name="TextAppearance.Sherlock.Light.SearchResult" parent="TextAppearance.Sherlock.SearchResult"/>
+
+    <style name="TextAppearance.Sherlock.Light.SearchResult.Title">
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="TextAppearance.Sherlock.Light.SearchResult.Subtitle">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
 </resources>
diff --git a/library/res/values/abs__themes.xml b/actionbarsherlock/res/values/abs__themes.xml
index 5300ded..6215e04 100644..100755
--- a/library/res/values/abs__themes.xml
+++ b/actionbarsherlock/res/values/abs__themes.xml
@@ -9,9 +9,7 @@
     </style>
     <style name="Sherlock.__Theme.DarkActionBar" parent="Theme.Sherlock.Light">
     </style>
-    <style name="Sherlock.__Theme.Dialog" parent="android:Theme.Dialog">
-    </style>
-    
+
     <style name="Theme.Sherlock" parent="Sherlock.__Theme">
         <!-- Action bar styles (from Theme.Holo) -->
         <item name="actionDropDownStyle">@style/Widget.Sherlock.Spinner.DropDown.ActionBar</item>
@@ -29,41 +27,59 @@
         <item name="actionBarSize">@dimen/abs__action_bar_default_height</item>
         <!-- Internal --><item name="actionModePopupWindowStyle">@style/Widget.Sherlock.PopupWindow.ActionMode</item>
         <item name="actionBarWidgetTheme">@null</item>
-        
+
         <!-- Action bar styles (defaults from Theme) -->
         <item name="actionBarSplitStyle">?attr/actionBarStyle</item>
         <item name="actionMenuTextAppearance">@style/TextAppearance.Sherlock.Widget.ActionBar.Menu</item>
         <item name="actionMenuTextColor">?attr/textColorPrimary</item>
         <item name="actionBarDivider">?attr/dividerVertical</item>
-        <item name="actionBarItemBackground">@drawable/abs__item_background_holo_dark</item>
+        <item name="actionBarItemBackground">?attr/selectableItemBackground</item>
 
         <item name="buttonStyleSmall">@style/Widget.Sherlock.Button.Small</item>
-        
+
+        <item name="selectableItemBackground">@drawable/abs__item_background_holo_dark</item>
+
         <item name="activatedBackgroundIndicator">@drawable/abs__activated_background_holo_dark</item>
         <item name="actionModeShareDrawable">@drawable/abs__ic_menu_share_holo_dark</item>
         <item name="activityChooserViewStyle">@style/Widget.Sherlock.ActivityChooserView</item>
-        
+
         <item name="homeAsUpIndicator">@drawable/abs__ic_ab_back_holo_dark</item>
-        
+
         <item name="dividerVertical">@drawable/abs__list_divider_holo_dark</item>
-        
+
         <item name="spinnerDropDownItemStyle">@style/Widget.Sherlock.DropDownItem.Spinner</item>
         <item name="spinnerItemStyle">@style/Widget.Sherlock.TextView.SpinnerItem</item>
-        
+
         <item name="textColorPrimary">@color/abs__primary_text_holo_dark</item>
         <item name="textColorPrimaryDisableOnly">@color/abs__primary_text_disable_only_holo_dark</item>
         <item name="textColorPrimaryInverse">@color/abs__primary_text_holo_light</item>
-        
+
         <!-- Internal --><item name="dropdownListPreferredItemHeight">48dip</item>
         <item name="dropDownListViewStyle">@style/Widget.Sherlock.ListView.DropDown</item>
 
         <item name="textAppearanceSmall">@style/TextAppearance.Sherlock.Small</item>
         <item name="textAppearanceLargePopupMenu">@style/TextAppearance.Sherlock.Widget.PopupMenu.Large</item>
         <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Sherlock.Widget.PopupMenu.Small</item>
-        
+        <item name="textAppearanceSearchResultTitle">@style/TextAppearance.Sherlock.SearchResult.Title</item>
+        <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.Sherlock.SearchResult.Subtitle</item>
+
         <item name="popupMenuStyle">@style/Widget.Sherlock.PopupMenu</item>
         <!-- Internal --><item name="listPopupWindowStyle">@style/Widget.Sherlock.ListPopupWindow</item>
-        
+
+        <item name="searchDropdownBackground">@drawable/abs__search_dropdown_dark</item>
+        <item name="searchViewTextField">@drawable/abs__textfield_searchview_holo_dark</item>
+        <item name="searchViewTextFieldRight">@drawable/abs__textfield_searchview_right_holo_dark</item>
+        <item name="searchViewCloseIcon">@drawable/abs__ic_clear</item>
+        <item name="searchViewSearchIcon">@drawable/abs__ic_search</item>
+        <item name="searchViewGoIcon">@drawable/abs__ic_go</item>
+        <item name="searchViewVoiceIcon">@drawable/abs__ic_voice_search</item>
+        <item name="searchAutoCompleteTextView">@style/Widget.Sherlock.SearchAutoCompleteTextView</item>
+        <item name="dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item>
+        <item name="searchViewEditQuery">@drawable/abs__ic_commit_search_api_holo_dark</item>
+        <item name="searchViewEditQueryBackground">?selectableItemBackground</item>
+        <item name="searchResultListItemHeight">58dp</item>
+
+        <item name="windowNoTitle">false</item>
         <item name="windowActionBar">true</item>
         <item name="windowActionModeOverlay">false</item>
         <item name="windowContentOverlay">@null</item>
@@ -85,41 +101,59 @@
         <item name="actionBarSize">@dimen/abs__action_bar_default_height</item>
         <!-- Internal --><item name="actionModePopupWindowStyle">@style/Widget.Sherlock.Light.PopupWindow.ActionMode</item>
         <item name="actionBarWidgetTheme">@null</item>
-        
+
         <!-- Action bar styles (defaults from Theme) -->
         <item name="actionBarSplitStyle">?attr/actionBarStyle</item>
         <item name="actionMenuTextAppearance">@style/TextAppearance.Sherlock.Widget.ActionBar.Menu</item>
         <item name="actionMenuTextColor">?attr/textColorPrimary</item>
         <item name="actionBarDivider">?attr/dividerVertical</item>
-        <item name="actionBarItemBackground">@drawable/abs__item_background_holo_light</item>
+        <item name="actionBarItemBackground">?attr/selectableItemBackground</item>
 
         <item name="buttonStyleSmall">@style/Widget.Sherlock.Light.Button.Small</item>
-        
+
+        <item name="selectableItemBackground">@drawable/abs__item_background_holo_light</item>
+
         <item name="activatedBackgroundIndicator">@drawable/abs__activated_background_holo_light</item>
         <item name="actionModeShareDrawable">@drawable/abs__ic_menu_share_holo_light</item>
         <item name="activityChooserViewStyle">@style/Widget.Sherlock.Light.ActivityChooserView</item>
-        
+
         <item name="homeAsUpIndicator">@drawable/abs__ic_ab_back_holo_light</item>
-        
+
         <item name="dividerVertical">@drawable/abs__list_divider_holo_light</item>
-        
+
         <item name="spinnerDropDownItemStyle">@style/Widget.Sherlock.Light.DropDownItem.Spinner</item>
         <item name="spinnerItemStyle">@style/Widget.Sherlock.TextView.SpinnerItem</item>
-        
+
         <item name="textColorPrimary">@color/abs__primary_text_holo_light</item>
         <item name="textColorPrimaryDisableOnly">@color/abs__primary_text_disable_only_holo_light</item>
         <item name="textColorPrimaryInverse">@color/abs__primary_text_holo_dark</item>
-        
+
         <!-- Internal --><item name="dropdownListPreferredItemHeight">48dip</item>
         <item name="dropDownListViewStyle">@style/Widget.Sherlock.Light.ListView.DropDown</item>
 
         <item name="textAppearanceSmall">@style/TextAppearance.Sherlock.Light.Small</item>
         <item name="textAppearanceLargePopupMenu">@style/TextAppearance.Sherlock.Light.Widget.PopupMenu.Large</item>
         <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.Sherlock.Light.Widget.PopupMenu.Small</item>
-        
+        <item name="textAppearanceSearchResultTitle">@style/TextAppearance.Sherlock.Light.SearchResult.Title</item>
+        <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.Sherlock.Light.SearchResult.Subtitle</item>
+
         <item name="popupMenuStyle">@style/Widget.Sherlock.Light.PopupMenu</item>
         <!-- Internal --><item name="listPopupWindowStyle">@style/Widget.Sherlock.Light.ListPopupWindow</item>
-        
+
+        <item name="searchDropdownBackground">@drawable/abs__search_dropdown_light</item>
+        <item name="searchViewTextField">@drawable/abs__textfield_searchview_holo_light</item>
+        <item name="searchViewTextFieldRight">@drawable/abs__textfield_searchview_right_holo_light</item>
+        <item name="searchViewCloseIcon">@drawable/abs__ic_clear_holo_light</item>
+        <item name="searchViewSearchIcon">@drawable/abs__ic_search_api_holo_light</item>
+        <item name="searchViewGoIcon">@drawable/abs__ic_go_search_api_holo_light</item>
+        <item name="searchViewVoiceIcon">@drawable/abs__ic_voice_search_api_holo_light</item>
+        <item name="searchAutoCompleteTextView">@style/Widget.Sherlock.Light.SearchAutoCompleteTextView</item>
+        <item name="dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item>
+        <item name="searchViewEditQuery">@drawable/abs__ic_commit_search_api_holo_light</item>
+        <item name="searchViewEditQueryBackground">?selectableItemBackground</item>
+        <item name="searchResultListItemHeight">58dp</item>
+
+        <item name="windowNoTitle">false</item>
         <item name="windowActionBar">true</item>
         <item name="windowActionModeOverlay">false</item>
         <item name="windowContentOverlay">@null</item>
@@ -145,11 +179,23 @@
         <item name="actionModeStyle">@style/Widget.Sherlock.Light.ActionMode.Inverse</item>
         <item name="actionModeCloseButtonStyle">@style/Widget.Sherlock.ActionButton.CloseMode</item>
         <item name="actionModePopupWindowStyle">@style/Widget.Sherlock.PopupWindow.ActionMode</item>
-        
+
         <item name="actionModeShareDrawable">@drawable/abs__ic_menu_share_holo_dark</item>
+
+        <!-- We want the dark action bar SearchView stuff -->
+        <item name="searchDropdownBackground">@drawable/abs__search_dropdown_dark</item>
+        <item name="searchViewTextField">@drawable/abs__textfield_searchview_holo_dark</item>
+        <item name="searchViewTextFieldRight">@drawable/abs__textfield_searchview_right_holo_dark</item>
+        <item name="searchViewCloseIcon">@drawable/abs__ic_clear</item>
+        <item name="searchViewSearchIcon">@drawable/abs__ic_search</item>
+        <item name="searchViewGoIcon">@drawable/abs__ic_go</item>
+        <item name="searchViewVoiceIcon">@drawable/abs__ic_voice_search</item>
+        <item name="searchAutoCompleteTextView">@style/Widget.Sherlock.SearchAutoCompleteTextView</item>
+        <item name="dropDownHintAppearance">@style/TextAppearance.Sherlock.Widget.DropDownHint</item>
+        <item name="searchViewEditQuery">@drawable/abs__ic_commit_search_api_holo_dark</item>
     </style>
-    
-    
+
+
     <style name="Theme.Sherlock.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -158,69 +204,4 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
-    
-    
-    <style name="Theme.Sherlock.ForceOverflow">
-        <item name="absForceOverflow">true</item>
-    </style>
-    <style name="Theme.Sherlock.Light.ForceOverflow">
-        <item name="absForceOverflow">true</item>
-    </style>
-    <style name="Theme.Sherlock.Light.DarkActionBar.ForceOverflow">
-        <item name="absForceOverflow">true</item>
-    </style>
-    
-    
-    <style name="Theme.Sherlock.Dialog" parent="android:Theme">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/DialogWindowTitle.Sherlock</item>
-        <item name="android:windowBackground">@drawable/abs__dialog_full_holo_dark</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-        
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:backgroundDimAmount">0.6</item>
-        
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        
-        <item name="android:textColorPrimary">@color/abs__primary_text_holo_dark</item>
-        <item name="android:textColorPrimaryInverse">@color/abs__primary_text_holo_light</item>
-        
-        <item name="windowMinWidthMajor">@dimen/abs__dialog_min_width_major</item>
-        <item name="windowMinWidthMinor">@dimen/abs__dialog_min_width_minor</item>
-        
-        <item name="windowActionBar">false</item>
-        <item name="windowContentOverlay">@null</item>
-    </style>
-    <style name="Theme.Sherlock.Light.Dialog" parent="android:Theme.Light">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/DialogWindowTitle.Sherlock.Light</item>
-        <item name="android:windowBackground">@drawable/abs__dialog_full_holo_light</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-        
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:windowCloseOnTouchOutside">true</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:backgroundDimAmount">0.6</item>
-        
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        
-        <item name="android:textColorPrimary">@color/abs__primary_text_holo_light</item>
-        <item name="android:textColorPrimaryInverse">@color/abs__primary_text_holo_dark</item>
-        
-        <item name="windowMinWidthMajor">@dimen/abs__dialog_min_width_major</item>
-        <item name="windowMinWidthMinor">@dimen/abs__dialog_min_width_minor</item>
-        
-        <item name="windowActionBar">false</item>
-        <item name="windowContentOverlay">@null</item>
-    </style>
 </resources>
diff --git a/library/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java b/actionbarsherlock/src/android/support/v4/app/Watson.java
index 3e3db62..ff72cdc 100644..100755
--- a/library/src/android/support/v4/app/_ActionBarSherlockTrojanHorse.java
+++ b/actionbarsherlock/src/android/support/v4/app/Watson.java
@@ -6,16 +6,15 @@ import android.view.Window;
 import com.actionbarsherlock.ActionBarSherlock.OnCreatePanelMenuListener;
 import com.actionbarsherlock.ActionBarSherlock.OnMenuItemSelectedListener;
 import com.actionbarsherlock.ActionBarSherlock.OnPreparePanelListener;
+import com.actionbarsherlock.BuildConfig;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
-
 import java.util.ArrayList;
 
 /** I'm in ur package. Stealing ur variables. */
-public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity implements OnCreatePanelMenuListener, OnPreparePanelListener, OnMenuItemSelectedListener {
-    private static final boolean DEBUG = false;
-    private static final String TAG = "_ActionBarSherlockTrojanHorse";
+public abstract class Watson extends FragmentActivity implements OnCreatePanelMenuListener, OnPreparePanelListener, OnMenuItemSelectedListener {
+    private static final String TAG = "Watson";
 
     /** Fragment interface for menu creation callback. */
     public interface OnCreateOptionsMenuListener {
@@ -27,7 +26,7 @@ public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity imp
     }
     /** Fragment interface for menu item selection callback. */
     public interface OnOptionsItemSelectedListener {
-      public boolean onOptionsItemSelected(MenuItem item);
+        public boolean onOptionsItemSelected(MenuItem item);
     }
 
     private ArrayList<Fragment> mCreatedMenus;
@@ -39,16 +38,16 @@ public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity imp
 
     @Override
     public boolean onCreatePanelMenu(int featureId, Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
 
         if (featureId == Window.FEATURE_OPTIONS_PANEL) {
             boolean result = onCreateOptionsMenu(menu);
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] activity create result: " + result);
 
             MenuInflater inflater = getSupportMenuInflater();
             boolean show = false;
             ArrayList<Fragment> newMenus = null;
-            if (mFragments.mActive != null) {
+            if (mFragments.mAdded != null) {
                 for (int i = 0; i < mFragments.mAdded.size(); i++) {
                     Fragment f = mFragments.mAdded.get(i);
                     if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnCreateOptionsMenuListener) {
@@ -73,10 +72,10 @@ public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity imp
 
             mCreatedMenus = newMenus;
 
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + show);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] fragments create result: " + show);
             result |= show;
 
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
             return result;
         }
         return false;
@@ -84,14 +83,14 @@ public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity imp
 
     @Override
     public boolean onPreparePanel(int featureId, View view, Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + " menu: " + menu);
 
         if (featureId == Window.FEATURE_OPTIONS_PANEL) {
             boolean result = onPrepareOptionsMenu(menu);
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] activity prepare result: " + result);
 
             boolean show = false;
-            if (mFragments.mActive != null) {
+            if (mFragments.mAdded != null) {
                 for (int i = 0; i < mFragments.mAdded.size(); i++) {
                     Fragment f = mFragments.mAdded.get(i);
                     if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnPrepareOptionsMenuListener) {
@@ -101,11 +100,11 @@ public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity imp
                 }
             }
 
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + show);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] fragments prepare result: " + show);
             result |= show;
 
             result &= menu.hasVisibleItems();
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
             return result;
         }
         return false;
@@ -113,14 +112,14 @@ public abstract class _ActionBarSherlockTrojanHorse extends FragmentActivity imp
 
     @Override
     public boolean onMenuItemSelected(int featureId, MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
 
         if (featureId == Window.FEATURE_OPTIONS_PANEL) {
             if (onOptionsItemSelected(item)) {
                 return true;
             }
 
-            if (mFragments.mActive != null) {
+            if (mFragments.mAdded != null) {
                 for (int i = 0; i < mFragments.mAdded.size(); i++) {
                     Fragment f = mFragments.mAdded.get(i);
                     if (f != null && !f.mHidden && f.mHasMenu && f.mMenuVisible && f instanceof OnOptionsItemSelectedListener) {
diff --git a/library/src/com/actionbarsherlock/ActionBarSherlock.java b/actionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
index 8340fb5..6d56f51 100644..100755
--- a/library/src/com/actionbarsherlock/ActionBarSherlock.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/ActionBarSherlock.java
@@ -1,14 +1,5 @@
 package com.actionbarsherlock;

 

-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

-import java.lang.annotation.ElementType;

-import java.lang.annotation.Retention;

-import java.lang.annotation.RetentionPolicy;

-import java.lang.annotation.Target;

-import java.lang.reflect.Constructor;

-import java.lang.reflect.InvocationTargetException;

-import java.util.HashMap;

-import java.util.Iterator;

 import android.app.Activity;

 import android.content.Context;

 import android.content.res.Configuration;

@@ -27,6 +18,16 @@ import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;

 import com.actionbarsherlock.view.MenuInflater;

 import com.actionbarsherlock.view.MenuItem;

+import java.lang.annotation.ElementType;

+import java.lang.annotation.Retention;

+import java.lang.annotation.RetentionPolicy;

+import java.lang.annotation.Target;

+import java.lang.reflect.Constructor;

+import java.lang.reflect.InvocationTargetException;

+import java.util.HashMap;

+import java.util.Iterator;

+

+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

 

 /**

  * <p>Helper for implementing the action bar design pattern across all versions

@@ -40,7 +41,6 @@ import com.actionbarsherlock.view.MenuItem;
  */

 public abstract class ActionBarSherlock {

     protected static final String TAG = "ActionBarSherlock";

-    protected static final boolean DEBUG = false;

 

     private static final Class<?>[] CONSTRUCTOR_ARGS = new Class[] { Activity.class, int.class };

     private static final HashMap<Implementation, Class<? extends ActionBarSherlock>> IMPLEMENTATIONS =

@@ -122,12 +122,12 @@ public abstract class ActionBarSherlock {
         if (!implementationClass.isAnnotationPresent(Implementation.class)) {

             throw new IllegalArgumentException("Class " + implementationClass.getSimpleName() + " is not annotated with @Implementation");

         } else if (IMPLEMENTATIONS.containsValue(implementationClass)) {

-            if (DEBUG) Log.w(TAG, "Class " + implementationClass.getSimpleName() + " already registered");

+            if (BuildConfig.DEBUG) Log.w(TAG, "Class " + implementationClass.getSimpleName() + " already registered");

             return;

         }

 

         Implementation impl = implementationClass.getAnnotation(Implementation.class);

-        if (DEBUG) Log.i(TAG, "Registering " + implementationClass.getSimpleName() + " with qualifier " + impl);

+        if (BuildConfig.DEBUG) Log.i(TAG, "Registering " + implementationClass.getSimpleName() + " with qualifier " + impl);

         IMPLEMENTATIONS.put(impl, implementationClass);

     }

 

@@ -223,7 +223,7 @@ public abstract class ActionBarSherlock {
             throw new IllegalStateException("No implementations match configuration.");

         }

         Class<? extends ActionBarSherlock> impl = impls.values().iterator().next();

-        if (DEBUG) Log.i(TAG, "Using implementation: " + impl.getSimpleName());

+        if (BuildConfig.DEBUG) Log.i(TAG, "Using implementation: " + impl.getSimpleName());

 

         try {

             Constructor<? extends ActionBarSherlock> ctor = impl.getConstructor(CONSTRUCTOR_ARGS);

@@ -253,7 +253,7 @@ public abstract class ActionBarSherlock {
 

 

     protected ActionBarSherlock(Activity activity, int flags) {

-        if (DEBUG) Log.d(TAG, "[<ctor>] activity: " + activity + ", flags: " + flags);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[<ctor>] activity: " + activity + ", flags: " + flags);

 

         mActivity = activity;

         mIsDelegate = (flags & FLAG_DELEGATE) != 0;

@@ -537,6 +537,9 @@ public abstract class ActionBarSherlock {
      */

     public void dispatchDestroy() {}

 

+    public void dispatchSaveInstanceState(Bundle outState) {}

+

+    public void dispatchRestoreInstanceState(Bundle savedInstanceState) {}

 

     ///////////////////////////////////////////////////////////////////////////

     ///////////////////////////////////////////////////////////////////////////

@@ -548,7 +551,7 @@ public abstract class ActionBarSherlock {
      * @return {@code true} if menu creation should proceed.

      */

     protected final boolean callbackCreateOptionsMenu(Menu menu) {

-        if (DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] menu: " + menu);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] menu: " + menu);

 

         boolean result = true;

         if (mActivity instanceof OnCreatePanelMenuListener) {

@@ -559,7 +562,7 @@ public abstract class ActionBarSherlock {
             result = listener.onCreateOptionsMenu(menu);

         }

 

-        if (DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] returning " + result);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[callbackCreateOptionsMenu] returning " + result);

         return result;

     }

 

@@ -569,7 +572,7 @@ public abstract class ActionBarSherlock {
      * @return {@code true} if menu preparation should proceed.

      */

     protected final boolean callbackPrepareOptionsMenu(Menu menu) {

-        if (DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] menu: " + menu);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] menu: " + menu);

 

         boolean result = true;

         if (mActivity instanceof OnPreparePanelListener) {

@@ -580,7 +583,7 @@ public abstract class ActionBarSherlock {
             result = listener.onPrepareOptionsMenu(menu);

         }

 

-        if (DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] returning " + result);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[callbackPrepareOptionsMenu] returning " + result);

         return result;

     }

 

@@ -592,7 +595,7 @@ public abstract class ActionBarSherlock {
      * @return {@code true} if the item selection was handled in the callback.

      */

     protected final boolean callbackOptionsItemSelected(MenuItem item) {

-        if (DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] item: " + item.getTitleCondensed());

+        if (BuildConfig.DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] item: " + item.getTitleCondensed());

 

         boolean result = false;

         if (mActivity instanceof OnMenuItemSelectedListener) {

@@ -603,7 +606,7 @@ public abstract class ActionBarSherlock {
             result = listener.onOptionsItemSelected(item);

         }

 

-        if (DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] returning " + result);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[callbackOptionsItemSelected] returning " + result);

         return result;

     }

 

@@ -663,7 +666,7 @@ public abstract class ActionBarSherlock {
      * @param view The desired content to display.

      */

     public void setContentView(View view) {

-        if (DEBUG) Log.d(TAG, "[setContentView] view: " + view);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[setContentView] view: " + view);

 

         setContentView(view, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));

     }

@@ -695,7 +698,7 @@ public abstract class ActionBarSherlock {
      * Change the title associated with this activity.

      */

     public void setTitle(int resId) {

-        if (DEBUG) Log.d(TAG, "[setTitle] resId: " + resId);

+        if (BuildConfig.DEBUG) Log.d(TAG, "[setTitle] resId: " + resId);

 

         setTitle(mActivity.getString(resId));

     }

@@ -764,12 +767,12 @@ public abstract class ActionBarSherlock {
      * @return Menu inflater instance.

      */

     public MenuInflater getMenuInflater() {

-        if (DEBUG) Log.d(TAG, "[getMenuInflater]");

+        if (BuildConfig.DEBUG) Log.d(TAG, "[getMenuInflater]");

 

         // Make sure that action views can get an appropriate theme.

         if (mMenuInflater == null) {

             if (getActionBar() != null) {

-                mMenuInflater = new MenuInflater(getThemedContext());

+                mMenuInflater = new MenuInflater(getThemedContext(), mActivity);

             } else {

                 mMenuInflater = new MenuInflater(mActivity);

             }

@@ -788,4 +791,9 @@ public abstract class ActionBarSherlock {
      * @see ActionMode

      */

     public abstract ActionMode startActionMode(ActionMode.Callback callback);

+

+    /**

+     * Ensure that the action bar is attached.

+     */

+    public void ensureActionBar() {}

 }

diff --git a/library/src/com/actionbarsherlock/app/ActionBar.java b/actionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
index 2497d24..03755be 100644..100755
--- a/library/src/com/actionbarsherlock/app/ActionBar.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/ActionBar.java
@@ -17,6 +17,7 @@
 package com.actionbarsherlock.app;

 

 import android.content.Context;

+import android.content.res.TypedArray;

 import android.graphics.drawable.Drawable;

 import android.support.v4.app.FragmentTransaction;

 import android.util.AttributeSet;

@@ -895,6 +896,10 @@ public abstract class ActionBar {
      * @attr ref android.R.styleable#ActionBar_LayoutParams_layout_gravity

      */

     public static class LayoutParams extends MarginLayoutParams {

+        private static final int[] ATTRS = new int[] {

+                android.R.attr.layout_gravity

+        };

+

         /**

          * Gravity for the view associated with these LayoutParams.

          *

@@ -918,6 +923,10 @@ public abstract class ActionBar {
 

         public LayoutParams(Context c, AttributeSet attrs) {

             super(c, attrs);

+

+            TypedArray a = c.obtainStyledAttributes(attrs, ATTRS);

+            gravity = a.getInt(0, -1);

+            a.recycle();

         }

 

         public LayoutParams(int width, int height) {

diff --git a/library/src/com/actionbarsherlock/app/SherlockActivity.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
index 9cb57e9..48a92da 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockActivity.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockActivity.java
@@ -116,6 +116,17 @@ public abstract class SherlockActivity extends Activity implements OnCreatePanel
         return super.dispatchKeyEvent(event);

     }

 

+    @Override

+    protected void onSaveInstanceState(Bundle outState) {

+        super.onSaveInstanceState(outState);

+        getSherlock().dispatchSaveInstanceState(outState);

+    }

+

+    @Override

+    protected void onRestoreInstanceState(Bundle savedInstanceState) {

+        super.onRestoreInstanceState(savedInstanceState);

+        getSherlock().dispatchRestoreInstanceState(savedInstanceState);

+    }

 

     ///////////////////////////////////////////////////////////////////////////

     // Native menu handling

@@ -232,6 +243,12 @@ public abstract class SherlockActivity extends Activity implements OnCreatePanel
         getSherlock().requestFeature((int)featureId);

     }

 

+    @Override

+    public View findViewById(int id) {

+        getSherlock().ensureActionBar();

+        return super.findViewById(id);

+    }

+

 

     ///////////////////////////////////////////////////////////////////////////

     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
index a7c856b..c139325 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockDialogFragment.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java
@@ -8,9 +8,9 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnCreateOptionsMenuListener;
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnOptionsItemSelectedListener;
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnPrepareOptionsMenuListener;
+import static android.support.v4.app.Watson.OnCreateOptionsMenuListener;
+import static android.support.v4.app.Watson.OnOptionsItemSelectedListener;
+import static android.support.v4.app.Watson.OnPrepareOptionsMenuListener;
 
 public class SherlockDialogFragment extends DialogFragment implements OnCreateOptionsMenuListener, OnPrepareOptionsMenuListener, OnOptionsItemSelectedListener {
     private SherlockFragmentActivity mActivity;
diff --git a/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
index 078f9b0..9f4e81d 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java
@@ -232,6 +232,12 @@ public abstract class SherlockExpandableListActivity extends ExpandableListActiv
         getSherlock().requestFeature((int)featureId);

     }

 

+    @Override

+    public View findViewById(int id) {

+        getSherlock().ensureActionBar();

+        return super.findViewById(id);

+    }

+

 

     ///////////////////////////////////////////////////////////////////////////

     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/app/SherlockFragment.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
index 0f24e9c..0bdd068 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockFragment.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragment.java
@@ -8,9 +8,9 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnCreateOptionsMenuListener;
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnOptionsItemSelectedListener;
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnPrepareOptionsMenuListener;
+import static android.support.v4.app.Watson.OnCreateOptionsMenuListener;
+import static android.support.v4.app.Watson.OnOptionsItemSelectedListener;
+import static android.support.v4.app.Watson.OnPrepareOptionsMenuListener;
 
 public class SherlockFragment extends Fragment implements OnCreateOptionsMenuListener, OnPrepareOptionsMenuListener, OnOptionsItemSelectedListener {
     private SherlockFragmentActivity mActivity;
diff --git a/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
index 5cd13ba..b09f05e 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
@@ -2,13 +2,14 @@ package com.actionbarsherlock.app;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
-import android.support.v4.app._ActionBarSherlockTrojanHorse;
+import android.support.v4.app.Watson;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 import com.actionbarsherlock.ActionBarSherlock;
+import com.actionbarsherlock.BuildConfig;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
@@ -17,9 +18,8 @@ import com.actionbarsherlock.view.MenuItem;
 import static com.actionbarsherlock.ActionBarSherlock.OnActionModeFinishedListener;
 import static com.actionbarsherlock.ActionBarSherlock.OnActionModeStartedListener;
 
-/** @see {@link _ActionBarSherlockTrojanHorse} */
-public class SherlockFragmentActivity extends _ActionBarSherlockTrojanHorse implements OnActionModeStartedListener, OnActionModeFinishedListener {
-    private static final boolean DEBUG = false;
+/** @see {@link android.support.v4.app.Watson} */
+public class SherlockFragmentActivity extends Watson implements OnActionModeStartedListener, OnActionModeFinishedListener {
     private static final String TAG = "SherlockFragmentActivity";
 
     private ActionBarSherlock mSherlock;
@@ -122,39 +122,50 @@ public class SherlockFragmentActivity extends _ActionBarSherlockTrojanHorse impl
         return super.dispatchKeyEvent(event);
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        getSherlock().dispatchSaveInstanceState(outState);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        getSherlock().dispatchRestoreInstanceState(savedInstanceState);
+    }
 
     ///////////////////////////////////////////////////////////////////////////
     // Native menu handling
     ///////////////////////////////////////////////////////////////////////////
 
     public MenuInflater getSupportMenuInflater() {
-        if (DEBUG) Log.d(TAG, "[getSupportMenuInflater]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[getSupportMenuInflater]");
 
         return getSherlock().getMenuInflater();
     }
 
     public void invalidateOptionsMenu() {
-        if (DEBUG) Log.d(TAG, "[invalidateOptionsMenu]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[invalidateOptionsMenu]");
 
         getSherlock().dispatchInvalidateOptionsMenu();
     }
 
     public void supportInvalidateOptionsMenu() {
-        if (DEBUG) Log.d(TAG, "[supportInvalidateOptionsMenu]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[supportInvalidateOptionsMenu]");
 
         invalidateOptionsMenu();
     }
 
     @Override
     public final boolean onCreatePanelMenu(int featureId, android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] featureId: " + featureId + ", menu: " + menu);
 
         if (featureId == Window.FEATURE_OPTIONS_PANEL && !mIgnoreNativeCreate) {
             mIgnoreNativeCreate = true;
             boolean result = getSherlock().dispatchCreateOptionsMenu(menu);
             mIgnoreNativeCreate = false;
 
-            if (DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onCreatePanelMenu] returning " + result);
             return result;
         }
         return super.onCreatePanelMenu(featureId, menu);
@@ -167,14 +178,14 @@ public class SherlockFragmentActivity extends _ActionBarSherlockTrojanHorse impl
 
     @Override
     public final boolean onPreparePanel(int featureId, View view, android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + ", menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] featureId: " + featureId + ", view: " + view + ", menu: " + menu);
 
         if (featureId == Window.FEATURE_OPTIONS_PANEL && !mIgnoreNativePrepare) {
             mIgnoreNativePrepare = true;
             boolean result = getSherlock().dispatchPrepareOptionsMenu(menu);
             mIgnoreNativePrepare = false;
 
-            if (DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onPreparePanel] returning " + result);
             return result;
         }
         return super.onPreparePanel(featureId, view, menu);
@@ -187,14 +198,14 @@ public class SherlockFragmentActivity extends _ActionBarSherlockTrojanHorse impl
 
     @Override
     public final boolean onMenuItemSelected(int featureId, android.view.MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[onMenuItemSelected] featureId: " + featureId + ", item: " + item);
 
         if (featureId == Window.FEATURE_OPTIONS_PANEL && !mIgnoreNativeSelected) {
             mIgnoreNativeSelected = true;
             boolean result = getSherlock().dispatchOptionsItemSelected(item);
             mIgnoreNativeSelected = false;
 
-            if (DEBUG) Log.d(TAG, "[onMenuItemSelected] returning " + result);
+            if (BuildConfig.DEBUG) Log.d(TAG, "[onMenuItemSelected] returning " + result);
             return result;
         }
         return super.onMenuItemSelected(featureId, item);
@@ -265,6 +276,12 @@ public class SherlockFragmentActivity extends _ActionBarSherlockTrojanHorse impl
         getSherlock().requestFeature((int)featureId);
     }
 
+    @Override
+    public View findViewById(int id) {
+        getSherlock().ensureActionBar();
+        return super.findViewById(id);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////
     // Progress Indication
diff --git a/library/src/com/actionbarsherlock/app/SherlockListActivity.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
index 00c00fe..7ced781 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockListActivity.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
@@ -116,6 +116,17 @@ public abstract class SherlockListActivity extends ListActivity implements OnCre
         return super.dispatchKeyEvent(event);

     }

 

+    @Override

+    protected void onSaveInstanceState(Bundle outState) {

+        super.onSaveInstanceState(outState);

+        getSherlock().dispatchSaveInstanceState(outState);

+    }

+

+    @Override

+    protected void onRestoreInstanceState(Bundle savedInstanceState) {

+        super.onRestoreInstanceState(savedInstanceState);

+        getSherlock().dispatchRestoreInstanceState(savedInstanceState);

+    }

 

     ///////////////////////////////////////////////////////////////////////////

     // Native menu handling

@@ -232,6 +243,12 @@ public abstract class SherlockListActivity extends ListActivity implements OnCre
         getSherlock().requestFeature((int)featureId);

     }

 

+    @Override

+    public View findViewById(int id) {

+        getSherlock().ensureActionBar();

+        return super.findViewById(id);

+    }

+

 

     ///////////////////////////////////////////////////////////////////////////

     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/app/SherlockListFragment.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
index 13ca3c4..7c4d095 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockListFragment.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockListFragment.java
@@ -8,9 +8,9 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnCreateOptionsMenuListener;
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnOptionsItemSelectedListener;
-import static com.actionbarsherlock.app.SherlockFragmentActivity.OnPrepareOptionsMenuListener;
+import static android.support.v4.app.Watson.OnCreateOptionsMenuListener;
+import static android.support.v4.app.Watson.OnOptionsItemSelectedListener;
+import static android.support.v4.app.Watson.OnPrepareOptionsMenuListener;
 
 public class SherlockListFragment extends ListFragment implements OnCreateOptionsMenuListener, OnPrepareOptionsMenuListener, OnOptionsItemSelectedListener {
     private SherlockFragmentActivity mActivity;
diff --git a/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
index 4f80be5..85c6ab2 100644..100755
--- a/library/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
@@ -116,6 +116,17 @@ public abstract class SherlockPreferenceActivity extends PreferenceActivity impl
         return super.dispatchKeyEvent(event);

     }

 

+    @Override

+    protected void onSaveInstanceState(Bundle outState) {

+        super.onSaveInstanceState(outState);

+        getSherlock().dispatchSaveInstanceState(outState);

+    }

+

+    @Override

+    protected void onRestoreInstanceState(Bundle savedInstanceState) {

+        super.onRestoreInstanceState(savedInstanceState);

+        getSherlock().dispatchRestoreInstanceState(savedInstanceState);

+    }

 

     ///////////////////////////////////////////////////////////////////////////

     // Native menu handling

@@ -232,6 +243,12 @@ public abstract class SherlockPreferenceActivity extends PreferenceActivity impl
         getSherlock().requestFeature((int)featureId);

     }

 

+    @Override

+    public View findViewById(int id) {

+        getSherlock().ensureActionBar();

+        return super.findViewById(id);

+    }

+

 

     ///////////////////////////////////////////////////////////////////////////

     // Progress Indication

diff --git a/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
index 05353d2..421c94b 100644..100755
--- a/library/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java
@@ -1,11 +1,5 @@
 package com.actionbarsherlock.internal;
 
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static com.actionbarsherlock.internal.ResourcesCompat.getResources_getBoolean;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import org.xmlpull.v1.XmlPullParser;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
@@ -28,9 +22,8 @@ import android.view.Window;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-import android.widget.TextView;
 import com.actionbarsherlock.ActionBarSherlock;
+import com.actionbarsherlock.BuildConfig;
 import com.actionbarsherlock.R;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.internal.app.ActionBarImpl;
@@ -46,12 +39,20 @@ import com.actionbarsherlock.internal.widget.IcsProgressBar;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.xmlpull.v1.XmlPullParser;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static com.actionbarsherlock.internal.ResourcesCompat.getResources_getBoolean;
 
 @ActionBarSherlock.Implementation(api = 7)
 public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBuilder.Callback, com.actionbarsherlock.view.Window.Callback, MenuPresenter.Callback, android.view.MenuItem.OnMenuItemClickListener {
     /** Window features which are enabled by default. */
     protected static final int DEFAULT_FEATURES = 0;
 
+    static private final String PANELS_TAG = "sherlock:Panels";
 
     public ActionBarSherlockCompat(Activity activity, int flags) {
         super(activity, flags);
@@ -71,8 +72,6 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
     private MenuBuilder mMenu;
     /** Map between native options items and sherlock items. */
     protected HashMap<android.view.MenuItem, MenuItemImpl> mNativeItemMap;
-    /** Indication of a long-press on the hardware menu key. */
-    private boolean mMenuKeyIsLongPress = false;
 
     /** Parent view of the window decoration (action bar, mode, etc.). */
     private ViewGroup mDecor;
@@ -109,13 +108,6 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
     /** Parent view in which the context action bar is displayed. */
     private ActionBarContextView mActionModeView;
 
-    /** Title view used with dialogs. */
-    private TextView mTitleView;
-    /** Current activity title. */
-    private CharSequence mTitle = null;
-    /** Whether or not this "activity" is floating (i.e., a dialog) */
-    private boolean mIsFloating;
-
 
 
     ///////////////////////////////////////////////////////////////////////////
@@ -124,14 +116,14 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public ActionBar getActionBar() {
-        if (DEBUG) Log.d(TAG, "[getActionBar]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[getActionBar]");
 
         initActionBar();
         return aActionBar;
     }
 
     private void initActionBar() {
-        if (DEBUG) Log.d(TAG, "[initActionBar]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[initActionBar]");
 
         // Initializing the window decor can change window feature flags.
         // Make sure that we have the correct set before performing the test below.
@@ -158,14 +150,14 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void setTitle(CharSequence title) {
-        if (DEBUG) Log.d(TAG, "[setTitle] title: " + title);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setTitle] title: " + title);
 
         dispatchTitleChanged(title, 0);
     }
 
     @Override
     public ActionMode startActionMode(ActionMode.Callback callback) {
-        if (DEBUG) Log.d(TAG, "[startActionMode] callback: " + callback);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[startActionMode] callback: " + callback);
 
         if (mActionMode != null) {
             mActionMode.finish();
@@ -216,7 +208,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void dispatchConfigurationChanged(Configuration newConfig) {
-        if (DEBUG) Log.d(TAG, "[dispatchConfigurationChanged] newConfig: " + newConfig);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchConfigurationChanged] newConfig: " + newConfig);
 
         if (aActionBar != null) {
             aActionBar.onConfigurationChanged(newConfig);
@@ -225,7 +217,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void dispatchPostResume() {
-        if (DEBUG) Log.d(TAG, "[dispatchPostResume]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchPostResume]");
 
         if (aActionBar != null) {
             aActionBar.setShowHideAnimationEnabled(true);
@@ -234,7 +226,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void dispatchPause() {
-        if (DEBUG) Log.d(TAG, "[dispatchPause]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchPause]");
 
         if (wActionBar != null && wActionBar.isOverflowMenuShowing()) {
             wActionBar.hideOverflowMenu();
@@ -243,7 +235,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void dispatchStop() {
-        if (DEBUG) Log.d(TAG, "[dispatchStop]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchStop]");
 
         if (aActionBar != null) {
             aActionBar.setShowHideAnimationEnabled(false);
@@ -252,7 +244,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void dispatchInvalidateOptionsMenu() {
-        if (DEBUG) Log.d(TAG, "[dispatchInvalidateOptionsMenu]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchInvalidateOptionsMenu]");
 
         Bundle savedActionViewStates = null;
         if (mMenu != null) {
@@ -276,7 +268,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public boolean dispatchOpenOptionsMenu() {
-        if (DEBUG) Log.d(TAG, "[dispatchOpenOptionsMenu]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchOpenOptionsMenu]");
 
         if (!isReservingOverflow()) {
             return false;
@@ -287,18 +279,21 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public boolean dispatchCloseOptionsMenu() {
-        if (DEBUG) Log.d(TAG, "[dispatchCloseOptionsMenu]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchCloseOptionsMenu]");
 
         if (!isReservingOverflow()) {
             return false;
         }
 
-        return wActionBar.hideOverflowMenu();
+        if (wActionBar != null) {
+            return wActionBar.hideOverflowMenu();
+        }
+        return false;
     }
 
     @Override
     public void dispatchPostCreate(Bundle savedInstanceState) {
-        if (DEBUG) Log.d(TAG, "[dispatchOnPostCreate]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchOnPostCreate]");
 
         if (mIsDelegate) {
             mIsTitleReady = true;
@@ -311,7 +306,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public boolean dispatchCreateOptionsMenu(android.view.Menu menu) {
-        if (DEBUG) {
+        if (BuildConfig.DEBUG) {
             Log.d(TAG, "[dispatchCreateOptionsMenu] android.view.Menu: " + menu);
             Log.d(TAG, "[dispatchCreateOptionsMenu] returning true");
         }
@@ -320,7 +315,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public boolean dispatchPrepareOptionsMenu(android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] android.view.Menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] android.view.Menu: " + menu);
 
         if (mActionMode != null) {
             return false;
@@ -346,7 +341,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
         }
 
         boolean result = mMenu.bindNativeOverflow(menu, this, mNativeItemMap);
-        if (DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] returning " + result);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] returning " + result);
         return result;
     }
 
@@ -357,7 +352,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public boolean dispatchMenuOpened(int featureId, android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[dispatchMenuOpened] featureId: " + featureId + ", menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchMenuOpened] featureId: " + featureId + ", menu: " + menu);
 
         if (featureId == Window.FEATURE_ACTION_BAR || featureId == Window.FEATURE_OPTIONS_PANEL) {
             if (aActionBar != null) {
@@ -371,7 +366,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void dispatchPanelClosed(int featureId, android.view.Menu menu){
-        if (DEBUG) Log.d(TAG, "[dispatchPanelClosed] featureId: " + featureId + ", menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchPanelClosed] featureId: " + featureId + ", menu: " + menu);
 
         if (featureId == Window.FEATURE_ACTION_BAR || featureId == Window.FEATURE_OPTIONS_PANEL) {
             if (aActionBar != null) {
@@ -382,22 +377,16 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void dispatchTitleChanged(CharSequence title, int color) {
-        if (DEBUG) Log.d(TAG, "[dispatchTitleChanged] title: " + title + ", color: " + color);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchTitleChanged] title: " + title + ", color: " + color);
 
-        if (!mIsDelegate || mIsTitleReady) {
-            if (mTitleView != null) {
-                mTitleView.setText(title);
-            } else if (wActionBar != null) {
-                wActionBar.setWindowTitle(title);
-            }
+        if ((!mIsDelegate || mIsTitleReady) && (wActionBar != null)) {
+            wActionBar.setWindowTitle(title);
         }
-
-        mTitle = title;
     }
 
     @Override
     public boolean dispatchKeyEvent(KeyEvent event) {
-        if (DEBUG) Log.d(TAG, "[dispatchKeyEvent] event: " + event);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchKeyEvent] event: " + event);
 
         final int keyCode = event.getKeyCode();
 
@@ -410,7 +399,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
                 if (action == KeyEvent.ACTION_UP) {
                     mActionMode.finish();
                 }
-                if (DEBUG) Log.d(TAG, "[dispatchKeyEvent] returning true");
+                if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchKeyEvent] returning true");
                 return true;
             }
 
@@ -419,32 +408,13 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
                 if (action == KeyEvent.ACTION_UP) {
                     wActionBar.collapseActionView();
                 }
-                if (DEBUG) Log.d(TAG, "[dispatchKeyEvent] returning true");
+                if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchKeyEvent] returning true");
                 return true;
             }
         }
 
-        boolean result = false;
-        if (keyCode == KeyEvent.KEYCODE_MENU && isReservingOverflow()) {
-            if (event.getAction() == KeyEvent.ACTION_DOWN && event.isLongPress()) {
-                mMenuKeyIsLongPress = true;
-            } else if (event.getAction() == KeyEvent.ACTION_UP) {
-                if (!mMenuKeyIsLongPress) {
-                    if (mActionMode == null && wActionBar != null) {
-                        if (wActionBar.isOverflowMenuShowing()) {
-                            wActionBar.hideOverflowMenu();
-                        } else {
-                            wActionBar.showOverflowMenu();
-                        }
-                    }
-                    result = true;
-                }
-                mMenuKeyIsLongPress = false;
-            }
-        }
-
-        if (DEBUG) Log.d(TAG, "[dispatchKeyEvent] returning " + result);
-        return result;
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchKeyEvent] returning false");
+        return false;
     }
 
     @Override
@@ -452,6 +422,19 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
         mIsDestroyed = true;
     }
 
+    @Override
+    public void dispatchSaveInstanceState(Bundle outState) {
+        if (mMenu != null) {
+            mMenuFrozenActionViewState = new Bundle();
+            mMenu.saveActionViewStates(mMenuFrozenActionViewState);
+        }
+        outState.putParcelable(PANELS_TAG, mMenuFrozenActionViewState);
+    }
+
+    @Override
+    public void dispatchRestoreInstanceState(Bundle savedInstanceState) {
+        mMenuFrozenActionViewState = savedInstanceState.getParcelable(PANELS_TAG);
+    }
 
     ///////////////////////////////////////////////////////////////////////////
     // Menu callback lifecycle and creation
@@ -600,7 +583,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public boolean onMenuItemClick(android.view.MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[mNativeItemListener.onMenuItemClick] item: " + item);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[mNativeItemListener.onMenuItemClick] item: " + item);
 
         final MenuItemImpl sherlockItem = mNativeItemMap.get(item);
         if (sherlockItem != null) {
@@ -624,7 +607,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void setProgressBarVisibility(boolean visible) {
-        if (DEBUG) Log.d(TAG, "[setProgressBarVisibility] visible: " + visible);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgressBarVisibility] visible: " + visible);
 
         setFeatureInt(Window.FEATURE_PROGRESS, visible ? Window.PROGRESS_VISIBILITY_ON :
             Window.PROGRESS_VISIBILITY_OFF);
@@ -632,7 +615,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void setProgressBarIndeterminateVisibility(boolean visible) {
-        if (DEBUG) Log.d(TAG, "[setProgressBarIndeterminateVisibility] visible: " + visible);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgressBarIndeterminateVisibility] visible: " + visible);
 
         setFeatureInt(Window.FEATURE_INDETERMINATE_PROGRESS,
                 visible ? Window.PROGRESS_VISIBILITY_ON : Window.PROGRESS_VISIBILITY_OFF);
@@ -640,7 +623,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void setProgressBarIndeterminate(boolean indeterminate) {
-        if (DEBUG) Log.d(TAG, "[setProgressBarIndeterminate] indeterminate: " + indeterminate);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgressBarIndeterminate] indeterminate: " + indeterminate);
 
         setFeatureInt(Window.FEATURE_PROGRESS,
                 indeterminate ? Window.PROGRESS_INDETERMINATE_ON : Window.PROGRESS_INDETERMINATE_OFF);
@@ -648,14 +631,14 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void setProgress(int progress) {
-        if (DEBUG) Log.d(TAG, "[setProgress] progress: " + progress);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgress] progress: " + progress);
 
         setFeatureInt(Window.FEATURE_PROGRESS, progress + Window.PROGRESS_START);
     }
 
     @Override
     public void setSecondaryProgress(int secondaryProgress) {
-        if (DEBUG) Log.d(TAG, "[setSecondaryProgress] secondaryProgress: " + secondaryProgress);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setSecondaryProgress] secondaryProgress: " + secondaryProgress);
 
         setFeatureInt(Window.FEATURE_PROGRESS,
                 secondaryProgress + Window.PROGRESS_SECONDARY_START);
@@ -794,23 +777,23 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
     ///////////////////////////////////////////////////////////////////////////
 
     private int getFeatures() {
-        if (DEBUG) Log.d(TAG, "[getFeatures] returning " + mFeatures);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[getFeatures] returning " + mFeatures);
 
         return mFeatures;
     }
 
     @Override
     public boolean hasFeature(int featureId) {
-        if (DEBUG) Log.d(TAG, "[hasFeature] featureId: " + featureId);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[hasFeature] featureId: " + featureId);
 
         boolean result = (mFeatures & (1 << featureId)) != 0;
-        if (DEBUG) Log.d(TAG, "[hasFeature] returning " + result);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[hasFeature] returning " + result);
         return result;
     }
 
     @Override
     public boolean requestFeature(int featureId) {
-        if (DEBUG) Log.d(TAG, "[requestFeature] featureId: " + featureId);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[requestFeature] featureId: " + featureId);
 
         if (mContentParent != null) {
             throw new AndroidRuntimeException("requestFeature() must be called before adding content");
@@ -833,21 +816,21 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void setUiOptions(int uiOptions) {
-        if (DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions);
 
         mUiOptions = uiOptions;
     }
 
     @Override
     public void setUiOptions(int uiOptions, int mask) {
-        if (DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions + ", mask: " + mask);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions + ", mask: " + mask);
 
         mUiOptions = (mUiOptions & ~mask) | (uiOptions & mask);
     }
 
     @Override
     public void setContentView(int layoutResId) {
-        if (DEBUG) Log.d(TAG, "[setContentView] layoutResId: " + layoutResId);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setContentView] layoutResId: " + layoutResId);
 
         if (mContentParent == null) {
             installDecor();
@@ -866,7 +849,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void setContentView(View view, ViewGroup.LayoutParams params) {
-        if (DEBUG) Log.d(TAG, "[setContentView] view: " + view + ", params: " + params);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setContentView] view: " + view + ", params: " + params);
 
         if (mContentParent == null) {
             installDecor();
@@ -885,7 +868,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
     @Override
     public void addContentView(View view, ViewGroup.LayoutParams params) {
-        if (DEBUG) Log.d(TAG, "[addContentView] view: " + view + ", params: " + params);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[addContentView] view: " + view + ", params: " + params);
 
         if (mContentParent == null) {
             installDecor();
@@ -896,7 +879,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
     }
 
     private void installDecor() {
-        if (DEBUG) Log.d(TAG, "[installDecor]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[installDecor]");
 
         if (mDecor == null) {
             mDecor = (ViewGroup)mActivity.getWindow().getDecorView().findViewById(android.R.id.content);
@@ -925,84 +908,70 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
                 }
             }
 
-            mTitleView = (TextView)mDecor.findViewById(android.R.id.title);
-            if (mTitleView != null) {
-                if (hasFeature(Window.FEATURE_NO_TITLE)) {
-                    mTitleView.setVisibility(View.GONE);
-                    if (mContentParent instanceof FrameLayout) {
-                        ((FrameLayout)mContentParent).setForeground(null);
-                    }
-                } else {
-                    mTitleView.setText(mTitle);
+            wActionBar = (ActionBarView)mDecor.findViewById(R.id.abs__action_bar);
+            if (wActionBar != null) {
+                wActionBar.setWindowCallback(this);
+                if (wActionBar.getTitle() == null) {
+                    wActionBar.setWindowTitle(mActivity.getTitle());
+                }
+                if (hasFeature(Window.FEATURE_PROGRESS)) {
+                    wActionBar.initProgress();
+                }
+                if (hasFeature(Window.FEATURE_INDETERMINATE_PROGRESS)) {
+                    wActionBar.initIndeterminateProgress();
                 }
-            } else {
-                wActionBar = (ActionBarView)mDecor.findViewById(R.id.abs__action_bar);
-                if (wActionBar != null) {
-                    wActionBar.setWindowCallback(this);
-                    if (wActionBar.getTitle() == null) {
-                        wActionBar.setWindowTitle(mActivity.getTitle());
-                    }
-                    if (hasFeature(Window.FEATURE_PROGRESS)) {
-                        wActionBar.initProgress();
-                    }
-                    if (hasFeature(Window.FEATURE_INDETERMINATE_PROGRESS)) {
-                        wActionBar.initIndeterminateProgress();
-                    }
 
-                    //Since we don't require onCreate dispatching, parse for uiOptions here
-                    int uiOptions = loadUiOptionsFromManifest(mActivity);
-                    if (uiOptions != 0) {
-                        mUiOptions = uiOptions;
-                    }
+                //Since we don't require onCreate dispatching, parse for uiOptions here
+                int uiOptions = loadUiOptionsFromManifest(mActivity);
+                if (uiOptions != 0) {
+                    mUiOptions = uiOptions;
+                }
 
-                    boolean splitActionBar = false;
-                    final boolean splitWhenNarrow = (mUiOptions & ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW) != 0;
-                    if (splitWhenNarrow) {
-                        splitActionBar = getResources_getBoolean(mActivity, R.bool.abs__split_action_bar_is_narrow);
-                    } else {
-                        splitActionBar = mActivity.getTheme()
-                                .obtainStyledAttributes(R.styleable.SherlockTheme)
-                                .getBoolean(R.styleable.SherlockTheme_windowSplitActionBar, false);
-                    }
-                    final ActionBarContainer splitView = (ActionBarContainer)mDecor.findViewById(R.id.abs__split_action_bar);
-                    if (splitView != null) {
-                        wActionBar.setSplitView(splitView);
-                        wActionBar.setSplitActionBar(splitActionBar);
-                        wActionBar.setSplitWhenNarrow(splitWhenNarrow);
-
-                        mActionModeView = (ActionBarContextView)mDecor.findViewById(R.id.abs__action_context_bar);
-                        mActionModeView.setSplitView(splitView);
-                        mActionModeView.setSplitActionBar(splitActionBar);
-                        mActionModeView.setSplitWhenNarrow(splitWhenNarrow);
-                    } else if (splitActionBar) {
-                        Log.e(TAG, "Requested split action bar with incompatible window decor! Ignoring request.");
-                    }
+                boolean splitActionBar = false;
+                final boolean splitWhenNarrow = (mUiOptions & ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW) != 0;
+                if (splitWhenNarrow) {
+                    splitActionBar = getResources_getBoolean(mActivity, R.bool.abs__split_action_bar_is_narrow);
+                } else {
+                    splitActionBar = mActivity.getTheme()
+                            .obtainStyledAttributes(R.styleable.SherlockTheme)
+                            .getBoolean(R.styleable.SherlockTheme_windowSplitActionBar, false);
+                }
+                final ActionBarContainer splitView = (ActionBarContainer)mDecor.findViewById(R.id.abs__split_action_bar);
+                if (splitView != null) {
+                    wActionBar.setSplitView(splitView);
+                    wActionBar.setSplitActionBar(splitActionBar);
+                    wActionBar.setSplitWhenNarrow(splitWhenNarrow);
+
+                    mActionModeView = (ActionBarContextView)mDecor.findViewById(R.id.abs__action_context_bar);
+                    mActionModeView.setSplitView(splitView);
+                    mActionModeView.setSplitActionBar(splitActionBar);
+                    mActionModeView.setSplitWhenNarrow(splitWhenNarrow);
+                } else if (splitActionBar) {
+                    Log.e(TAG, "Requested split action bar with incompatible window decor! Ignoring request.");
+                }
 
-                    // Post the panel invalidate for later; avoid application onCreateOptionsMenu
-                    // being called in the middle of onCreate or similar.
-                    mDecor.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            //Invalidate if the panel menu hasn't been created before this.
-                            if (!mIsDestroyed && !mActivity.isFinishing() && mMenu == null) {
-                                dispatchInvalidateOptionsMenu();
-                            }
+                // Post the panel invalidate for later; avoid application onCreateOptionsMenu
+                // being called in the middle of onCreate or similar.
+                mDecor.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        //Invalidate if the panel menu hasn't been created before this.
+                        if (!mIsDestroyed && !mActivity.isFinishing() && mMenu == null) {
+                            dispatchInvalidateOptionsMenu();
                         }
-                    });
-                }
+                    }
+                });
             }
         }
     }
 
     private ViewGroup generateLayout() {
-        if (DEBUG) Log.d(TAG, "[generateLayout]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[generateLayout]");
 
         // Apply data from current theme.
 
         TypedArray a = mActivity.getTheme().obtainStyledAttributes(R.styleable.SherlockTheme);
 
-        mIsFloating = a.getBoolean(R.styleable.SherlockTheme_android_windowIsFloating, false);
-
         if (!a.hasValue(R.styleable.SherlockTheme_windowActionBar)) {
             throw new IllegalStateException("You must use Theme.Sherlock, Theme.Sherlock.Light, Theme.Sherlock.Light.DarkActionBar, or a derivative.");
         }
@@ -1026,18 +995,10 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
         int layoutResource;
         if (!hasFeature(Window.FEATURE_NO_TITLE)) {
-            if (mIsFloating) {
-                //Trash original dialog LinearLayout
-                mDecor = (ViewGroup)mDecor.getParent();
-                mDecor.removeAllViews();
-
-                layoutResource = R.layout.abs__dialog_title_holo;
+            if (hasFeature(Window.FEATURE_ACTION_BAR_OVERLAY)) {
+                layoutResource = R.layout.abs__screen_action_bar_overlay;
             } else {
-                if (hasFeature(Window.FEATURE_ACTION_BAR_OVERLAY)) {
-                    layoutResource = R.layout.abs__screen_action_bar_overlay;
-                } else {
-                    layoutResource = R.layout.abs__screen_action_bar;
-                }
+                layoutResource = R.layout.abs__screen_action_bar;
             }
         } else if (hasFeature(Window.FEATURE_ACTION_MODE_OVERLAY) && !hasFeature(Window.FEATURE_NO_TITLE)) {
             layoutResource = R.layout.abs__screen_simple_overlay_action_mode;
@@ -1045,7 +1006,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
             layoutResource = R.layout.abs__screen_simple;
         }
 
-        if (DEBUG) Log.d(TAG, "[generateLayout] using screen XML " + mActivity.getResources().getString(layoutResource));
+        if (BuildConfig.DEBUG) Log.d(TAG, "[generateLayout] using screen XML " + mActivity.getResources().getString(layoutResource));
         View in = mActivity.getLayoutInflater().inflate(layoutResource, null);
         mDecor.addView(in, new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
 
@@ -1090,7 +1051,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
         int uiOptions = 0;
         try {
             final String thisPackage = activity.getClass().getName();
-            if (DEBUG) Log.i(TAG, "Parsing AndroidManifest.xml for " + thisPackage);
+            if (BuildConfig.DEBUG) Log.i(TAG, "Parsing AndroidManifest.xml for " + thisPackage);
 
             final String packageName = activity.getApplicationInfo().packageName;
             final AssetManager am = activity.createPackageContext(packageName, 0).getAssets();
@@ -1103,10 +1064,10 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
 
                     if ("application".equals(name)) {
                         //Check if the <application> has the attribute
-                        if (DEBUG) Log.d(TAG, "Got <application>");
+                        if (BuildConfig.DEBUG) Log.d(TAG, "Got <application>");
 
                         for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
-                            if (DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
+                            if (BuildConfig.DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
 
                             if ("uiOptions".equals(xml.getAttributeName(i))) {
                                 uiOptions = xml.getAttributeIntValue(i, 0);
@@ -1115,13 +1076,13 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
                         }
                     } else if ("activity".equals(name)) {
                         //Check if the <activity> is us and has the attribute
-                        if (DEBUG) Log.d(TAG, "Got <activity>");
+                        if (BuildConfig.DEBUG) Log.d(TAG, "Got <activity>");
                         Integer activityUiOptions = null;
                         String activityPackage = null;
                         boolean isOurActivity = false;
 
                         for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
-                            if (DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
+                            if (BuildConfig.DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
 
                             //We need both uiOptions and name attributes
                             String attrName = xml.getAttributeName(i);
@@ -1153,7 +1114,7 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
         } catch (Exception e) {
             e.printStackTrace();
         }
-        if (DEBUG) Log.i(TAG, "Returning " + Integer.toHexString(uiOptions));
+        if (BuildConfig.DEBUG) Log.i(TAG, "Returning " + Integer.toHexString(uiOptions));
         return uiOptions;
     }
 
@@ -1204,4 +1165,13 @@ public class ActionBarSherlockCompat extends ActionBarSherlock implements MenuBu
             mActionMode = null;
         }
     }
+
+    @Override
+    public void ensureActionBar() {
+        if (BuildConfig.DEBUG) Log.d(TAG, "[ensureActionBar]");
+
+        if (mDecor == null) {
+            initActionBar();
+        }
+    }
 }
diff --git a/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
index 9afca18..4f67b9f 100644..100755
--- a/library/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java
@@ -1,19 +1,22 @@
 package com.actionbarsherlock.internal;
 
-import com.actionbarsherlock.ActionBarSherlock;
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.internal.app.ActionBarWrapper;
-import com.actionbarsherlock.internal.view.menu.MenuWrapper;
-import com.actionbarsherlock.view.ActionMode;
-import com.actionbarsherlock.view.MenuInflater;
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
 import android.view.View;
-import android.view.Window;
 import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+import com.actionbarsherlock.ActionBarSherlock;
+import com.actionbarsherlock.BuildConfig;
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.internal.app.ActionBarWrapper;
+import com.actionbarsherlock.internal.view.menu.MenuItemWrapper;
+import com.actionbarsherlock.internal.view.menu.MenuWrapper;
+import com.actionbarsherlock.view.ActionMode;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 
 @ActionBarSherlock.Implementation(api = 14)
 public class ActionBarSherlockNative extends ActionBarSherlock {
@@ -28,7 +31,7 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
 
     @Override
     public ActionBar getActionBar() {
-        if (DEBUG) Log.d(TAG, "[getActionBar]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[getActionBar]");
 
         initActionBar();
         return mActionBar;
@@ -44,77 +47,89 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
 
     @Override
     public void dispatchInvalidateOptionsMenu() {
-        if (DEBUG) Log.d(TAG, "[dispatchInvalidateOptionsMenu]");
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchInvalidateOptionsMenu]");
 
         mActivity.getWindow().invalidatePanelMenu(Window.FEATURE_OPTIONS_PANEL);
+
+        if (mMenu != null) mMenu.invalidate();
     }
 
     @Override
     public boolean dispatchCreateOptionsMenu(android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[dispatchCreateOptionsMenu] menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchCreateOptionsMenu] menu: " + menu);
 
         if (mMenu == null || menu != mMenu.unwrap()) {
             mMenu = new MenuWrapper(menu);
         }
 
         final boolean result = callbackCreateOptionsMenu(mMenu);
-        if (DEBUG) Log.d(TAG, "[dispatchCreateOptionsMenu] returning " + result);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchCreateOptionsMenu] returning " + result);
         return result;
     }
 
     @Override
     public boolean dispatchPrepareOptionsMenu(android.view.Menu menu) {
-        if (DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] menu: " + menu);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] menu: " + menu);
 
         final boolean result = callbackPrepareOptionsMenu(mMenu);
-        if (DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] returning " + result);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu] returning " + result);
         return result;
     }
 
     @Override
     public boolean dispatchOptionsItemSelected(android.view.MenuItem item) {
-        if (DEBUG) Log.d(TAG, "[dispatchOptionsItemSelected] item: " + item.getTitleCondensed());
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchOptionsItemSelected] item: " + item.getTitleCondensed());
 
-        final boolean result = callbackOptionsItemSelected(mMenu.findItem(item));
-        if (DEBUG) Log.d(TAG, "[dispatchOptionsItemSelected] returning " + result);
+        MenuItem wrapped;
+        if (mMenu == null) {
+            if (item.getItemId() != android.R.id.home) {
+                throw new IllegalStateException("Non-home action item clicked before onCreateOptionsMenu with ID " + item.getItemId());
+            }
+            // Create a throw-away wrapper for now.
+            wrapped = new MenuItemWrapper(item);
+        } else {
+            wrapped = mMenu.findItem(item);
+        }
+        final boolean result = callbackOptionsItemSelected(wrapped);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[dispatchOptionsItemSelected] returning " + result);
         return result;
     }
 
     @Override
     public boolean hasFeature(int feature) {
-        if (DEBUG) Log.d(TAG, "[hasFeature] feature: " + feature);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[hasFeature] feature: " + feature);
 
         final boolean result = mActivity.getWindow().hasFeature(feature);
-        if (DEBUG) Log.d(TAG, "[hasFeature] returning " + result);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[hasFeature] returning " + result);
         return result;
     }
 
     @Override
     public boolean requestFeature(int featureId) {
-        if (DEBUG) Log.d(TAG, "[requestFeature] featureId: " + featureId);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[requestFeature] featureId: " + featureId);
 
         final boolean result = mActivity.getWindow().requestFeature(featureId);
-        if (DEBUG) Log.d(TAG, "[requestFeature] returning " + result);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[requestFeature] returning " + result);
         return result;
     }
 
     @Override
     public void setUiOptions(int uiOptions) {
-        if (DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions);
 
         mActivity.getWindow().setUiOptions(uiOptions);
     }
 
     @Override
     public void setUiOptions(int uiOptions, int mask) {
-        if (DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions + ", mask: " + mask);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setUiOptions] uiOptions: " + uiOptions + ", mask: " + mask);
 
         mActivity.getWindow().setUiOptions(uiOptions, mask);
     }
 
     @Override
     public void setContentView(int layoutResId) {
-        if (DEBUG) Log.d(TAG, "[setContentView] layoutResId: " + layoutResId);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setContentView] layoutResId: " + layoutResId);
 
         mActivity.getWindow().setContentView(layoutResId);
         initActionBar();
@@ -122,7 +137,7 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
 
     @Override
     public void setContentView(View view, LayoutParams params) {
-        if (DEBUG) Log.d(TAG, "[setContentView] view: " + view + ", params: " + params);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setContentView] view: " + view + ", params: " + params);
 
         mActivity.getWindow().setContentView(view, params);
         initActionBar();
@@ -130,7 +145,7 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
 
     @Override
     public void addContentView(View view, LayoutParams params) {
-        if (DEBUG) Log.d(TAG, "[addContentView] view: " + view + ", params: " + params);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[addContentView] view: " + view + ", params: " + params);
 
         mActivity.getWindow().addContentView(view, params);
         initActionBar();
@@ -138,42 +153,42 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
 
     @Override
     public void setTitle(CharSequence title) {
-        if (DEBUG) Log.d(TAG, "[setTitle] title: " + title);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setTitle] title: " + title);
 
         mActivity.getWindow().setTitle(title);
     }
 
     @Override
     public void setProgressBarVisibility(boolean visible) {
-        if (DEBUG) Log.d(TAG, "[setProgressBarVisibility] visible: " + visible);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgressBarVisibility] visible: " + visible);
 
         mActivity.setProgressBarVisibility(visible);
     }
 
     @Override
     public void setProgressBarIndeterminateVisibility(boolean visible) {
-        if (DEBUG) Log.d(TAG, "[setProgressBarIndeterminateVisibility] visible: " + visible);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgressBarIndeterminateVisibility] visible: " + visible);
 
         mActivity.setProgressBarIndeterminateVisibility(visible);
     }
 
     @Override
     public void setProgressBarIndeterminate(boolean indeterminate) {
-        if (DEBUG) Log.d(TAG, "[setProgressBarIndeterminate] indeterminate: " + indeterminate);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgressBarIndeterminate] indeterminate: " + indeterminate);
 
         mActivity.setProgressBarIndeterminate(indeterminate);
     }
 
     @Override
     public void setProgress(int progress) {
-        if (DEBUG) Log.d(TAG, "[setProgress] progress: " + progress);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setProgress] progress: " + progress);
 
         mActivity.setProgress(progress);
     }
 
     @Override
     public void setSecondaryProgress(int secondaryProgress) {
-        if (DEBUG) Log.d(TAG, "[setSecondaryProgress] secondaryProgress: " + secondaryProgress);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[setSecondaryProgress] secondaryProgress: " + secondaryProgress);
 
         mActivity.setSecondaryProgress(secondaryProgress);
     }
@@ -194,7 +209,7 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
 
     @Override
     public ActionMode startActionMode(com.actionbarsherlock.view.ActionMode.Callback callback) {
-        if (DEBUG) Log.d(TAG, "[startActionMode] callback: " + callback);
+        if (BuildConfig.DEBUG) Log.d(TAG, "[startActionMode] callback: " + callback);
 
         if (mActionMode != null) {
             mActionMode.finish();
@@ -208,7 +223,12 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
         //is where we will set the new instance to mActionMode since we need
         //to pass it through to the sherlock callbacks and the call below
         //will not have returned yet to store its value.
-        mActivity.startActionMode(wrapped);
+        if (mActivity.startActionMode(wrapped) == null) {
+            mActionMode = null;
+        }
+        if (mActivity instanceof OnActionModeStartedListener && mActionMode != null) {
+            ((OnActionModeStartedListener)mActivity).onActionModeStarted(mActionMode);
+        }
 
         return mActionMode;
     }
@@ -241,6 +261,9 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
         @Override
         public void onDestroyActionMode(android.view.ActionMode mode) {
             mCallback.onDestroyActionMode(mActionMode);
+            if (mActivity instanceof OnActionModeFinishedListener) {
+                ((OnActionModeFinishedListener)mActivity).onActionModeFinished(mActionMode);
+            }
         }
     }
 
@@ -280,6 +303,7 @@ public class ActionBarSherlockNative extends ActionBarSherlock {
         @Override
         public void invalidate() {
             mActionMode.invalidate();
+            if (mMenu != null) mMenu.invalidate();
         }
 
         @Override
diff --git a/actionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java b/actionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
new file mode 100755
index 0000000..55a86a8
--- /dev/null
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java
@@ -0,0 +1,182 @@
+package com.actionbarsherlock.internal;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.content.res.XmlResourceParser;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import com.actionbarsherlock.BuildConfig;
+import com.actionbarsherlock.R;
+import org.xmlpull.v1.XmlPullParser;
+
+public final class ResourcesCompat {
+    private static final String TAG = "ResourcesCompat";
+
+    //No instances
+    private ResourcesCompat() {}
+
+
+    /**
+     * Support implementation of {@code getResources().getBoolean()} that we
+     * can use to simulate filtering based on width and smallest width
+     * qualifiers on pre-3.2.
+     *
+     * @param context Context to load booleans from on 3.2+ and to fetch the
+     * display metrics.
+     * @param id Id of boolean to load.
+     * @return Associated boolean value as reflected by the current display
+     * metrics.
+     */
+    public static boolean getResources_getBoolean(Context context, int id) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
+            return context.getResources().getBoolean(id);
+        }
+
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        float widthDp = metrics.widthPixels / metrics.density;
+        float heightDp = metrics.heightPixels / metrics.density;
+        float smallestWidthDp = (widthDp < heightDp) ? widthDp : heightDp;
+
+        if (id == R.bool.abs__action_bar_embed_tabs) {
+            if (widthDp >= 480) {
+                return true; //values-w480dp
+            }
+            return false; //values
+        }
+        if (id == R.bool.abs__split_action_bar_is_narrow) {
+            if (widthDp >= 480) {
+                return false; //values-w480dp
+            }
+            return true; //values
+        }
+        if (id == R.bool.abs__action_bar_expanded_action_views_exclusive) {
+            if (smallestWidthDp >= 600) {
+                return false; //values-sw600dp
+            }
+            return true; //values
+        }
+        if (id == R.bool.abs__config_allowActionMenuItemTextWithIcon) {
+            if (widthDp >= 480) {
+                return true; //values-w480dp
+            }
+            return false; //values
+        }
+
+        throw new IllegalArgumentException("Unknown boolean resource ID " + id);
+    }
+
+    /**
+     * Support implementation of {@code getResources().getInteger()} that we
+     * can use to simulate filtering based on width qualifiers on pre-3.2.
+     *
+     * @param context Context to load integers from on 3.2+ and to fetch the
+     * display metrics.
+     * @param id Id of integer to load.
+     * @return Associated integer value as reflected by the current display
+     * metrics.
+     */
+    public static int getResources_getInteger(Context context, int id) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
+            return context.getResources().getInteger(id);
+        }
+
+        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
+        float widthDp = metrics.widthPixels / metrics.density;
+
+        if (id == R.integer.abs__max_action_buttons) {
+            if (widthDp >= 600) {
+                return 5; //values-w600dp
+            }
+            if (widthDp >= 500) {
+                return 4; //values-w500dp
+            }
+            if (widthDp >= 360) {
+                return 3; //values-w360dp
+            }
+            return 2; //values
+        }
+
+        throw new IllegalArgumentException("Unknown integer resource ID " + id);
+    }
+
+    /**
+     * Attempt to programmatically load the logo from the manifest file of an
+     * activity by using an XML pull parser. This should allow us to read the
+     * logo attribute regardless of the platform it is being run on.
+     *
+     * @param activity Activity instance.
+     * @return Logo resource ID.
+     */
+    public static int loadLogoFromManifest(Activity activity) {
+        int logo = 0;
+        try {
+            final String thisPackage = activity.getClass().getName();
+            if (BuildConfig.DEBUG) Log.i(TAG, "Parsing AndroidManifest.xml for " + thisPackage);
+
+            final String packageName = activity.getApplicationInfo().packageName;
+            final AssetManager am = activity.createPackageContext(packageName, 0).getAssets();
+            final XmlResourceParser xml = am.openXmlResourceParser("AndroidManifest.xml");
+
+            int eventType = xml.getEventType();
+            while (eventType != XmlPullParser.END_DOCUMENT) {
+                if (eventType == XmlPullParser.START_TAG) {
+                    String name = xml.getName();
+
+                    if ("application".equals(name)) {
+                        //Check if the <application> has the attribute
+                        if (BuildConfig.DEBUG) Log.d(TAG, "Got <application>");
+
+                        for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
+                            if (BuildConfig.DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
+
+                            if ("logo".equals(xml.getAttributeName(i))) {
+                                logo = xml.getAttributeResourceValue(i, 0);
+                                break; //out of for loop
+                            }
+                        }
+                    } else if ("activity".equals(name)) {
+                        //Check if the <activity> is us and has the attribute
+                        if (BuildConfig.DEBUG) Log.d(TAG, "Got <activity>");
+                        Integer activityLogo = null;
+                        String activityPackage = null;
+                        boolean isOurActivity = false;
+
+                        for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
+                            if (BuildConfig.DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
+
+                            //We need both uiOptions and name attributes
+                            String attrName = xml.getAttributeName(i);
+                            if ("logo".equals(attrName)) {
+                                activityLogo = xml.getAttributeResourceValue(i, 0);
+                            } else if ("name".equals(attrName)) {
+                                activityPackage = ActionBarSherlockCompat.cleanActivityName(packageName, xml.getAttributeValue(i));
+                                if (!thisPackage.equals(activityPackage)) {
+                                    break; //on to the next
+                                }
+                                isOurActivity = true;
+                            }
+
+                            //Make sure we have both attributes before processing
+                            if ((activityLogo != null) && (activityPackage != null)) {
+                                //Our activity, logo specified, override with our value
+                                logo = activityLogo.intValue();
+                            }
+                        }
+                        if (isOurActivity) {
+                            //If we matched our activity but it had no logo don't
+                            //do any more processing of the manifest
+                            break;
+                        }
+                    }
+                }
+                eventType = xml.nextToken();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (BuildConfig.DEBUG) Log.i(TAG, "Returning " + Integer.toHexString(logo));
+        return logo;
+    }
+}
diff --git a/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
index 6ae0402..81f7d80 100644..100755
--- a/library/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java
@@ -26,6 +26,7 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Handler;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
@@ -36,7 +37,6 @@ import android.view.accessibility.AccessibilityEvent;
 import android.widget.SpinnerAdapter;
 import com.actionbarsherlock.R;
 import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.internal.nineoldandroids.animation.Animator;
 import com.actionbarsherlock.internal.nineoldandroids.animation.AnimatorListenerAdapter;
 import com.actionbarsherlock.internal.nineoldandroids.animation.AnimatorSet;
@@ -170,7 +170,12 @@ public class ActionBarImpl extends ActionBar {
 
         // Older apps get the home button interaction enabled by default.
         // Newer apps need to enable it explicitly.
-        setHomeButtonEnabled(mContext.getApplicationInfo().targetSdkVersion < 14);
+        boolean homeButtonEnabled = mContext.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
+
+        // If the homeAsUp display option is set, always enable the home button.
+        homeButtonEnabled |= (mActionView.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0;
+
+        setHomeButtonEnabled(homeButtonEnabled);
 
         setHasEmbeddedTabs(getResources_getBoolean(mContext,
                 R.bool.abs__action_bar_embed_tabs));
@@ -506,8 +511,8 @@ public class ActionBarImpl extends ActionBar {
         }
 
         FragmentTransaction trans = null;
-        if (mActivity instanceof SherlockFragmentActivity) {
-            trans = ((SherlockFragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
+        if (mActivity instanceof FragmentActivity) {
+            trans = ((FragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
                     .disallowAddToBackStack();
         }
 
diff --git a/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
index e390ea4..fe479d0 100644..100755
--- a/library/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java
@@ -6,12 +6,12 @@ import java.util.Set;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 import android.widget.SpinnerAdapter;
 
 import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 
 public class ActionBarWrapper extends ActionBar implements android.app.ActionBar.OnNavigationListener, android.app.ActionBar.OnMenuVisibilityListener {
     private final Activity mActivity;
@@ -26,6 +26,10 @@ public class ActionBarWrapper extends ActionBar implements android.app.ActionBar
         mActionBar = activity.getActionBar();
         if (mActionBar != null) {
             mActionBar.addOnMenuVisibilityListener(this);
+
+            // Fixes issue #746
+            int displayOptions = mActionBar.getDisplayOptions();
+            mActionBar.setHomeButtonEnabled((displayOptions & DISPLAY_HOME_AS_UP) != 0);
         }
     }
 
@@ -132,11 +136,19 @@ public class ActionBarWrapper extends ActionBar implements android.app.ActionBar
     @Override
     public void setDisplayOptions(int options) {
         mActionBar.setDisplayOptions(options);
+
+        // Fixes issue #746
+        mActionBar.setHomeButtonEnabled((options & DISPLAY_HOME_AS_UP) != 0);
     }
 
     @Override
     public void setDisplayOptions(int options, int mask) {
         mActionBar.setDisplayOptions(options, mask);
+
+        // Fixes issue #746
+        if ((mask & DISPLAY_HOME_AS_UP) != 0) {
+            mActionBar.setHomeButtonEnabled((options & DISPLAY_HOME_AS_UP) != 0);
+        }
     }
 
     @Override
@@ -319,8 +331,8 @@ public class ActionBarWrapper extends ActionBar implements android.app.ActionBar
         public void onTabReselected(android.app.ActionBar.Tab tab, android.app.FragmentTransaction ft) {
             if (mListener != null) {
                 FragmentTransaction trans = null;
-                if (mActivity instanceof SherlockFragmentActivity) {
-                    trans = ((SherlockFragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
+                if (mActivity instanceof FragmentActivity) {
+                    trans = ((FragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
                             .disallowAddToBackStack();
                 }
 
@@ -336,8 +348,8 @@ public class ActionBarWrapper extends ActionBar implements android.app.ActionBar
         public void onTabSelected(android.app.ActionBar.Tab tab, android.app.FragmentTransaction ft) {
             if (mListener != null) {
 
-                if (mFragmentTransaction == null && mActivity instanceof SherlockFragmentActivity) {
-                    mFragmentTransaction = ((SherlockFragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
+                if (mFragmentTransaction == null && mActivity instanceof FragmentActivity) {
+                    mFragmentTransaction = ((FragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
                             .disallowAddToBackStack();
                 }
 
@@ -356,8 +368,8 @@ public class ActionBarWrapper extends ActionBar implements android.app.ActionBar
         public void onTabUnselected(android.app.ActionBar.Tab tab, android.app.FragmentTransaction ft) {
             if (mListener != null) {
                 FragmentTransaction trans = null;
-                if (mActivity instanceof SherlockFragmentActivity) {
-                    trans = ((SherlockFragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
+                if (mActivity instanceof FragmentActivity) {
+                    trans = ((FragmentActivity)mActivity).getSupportFragmentManager().beginTransaction()
                             .disallowAddToBackStack();
                     mFragmentTransaction = trans;
                 }
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
index 2caf5b4..2caf5b4 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
index 02ddff4..02ddff4 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
index 3231080..3231080 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
index e410193..e410193 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
index 6d9dafa..6d9dafa 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
index ed5e79e..ed5e79e 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
index e9215e7..e9215e7 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
index ab76fa7..ab76fa7 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
index a71e1ad..a71e1ad 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
index 21d15c0..21d15c0 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
index 84f7504..84f7504 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
index 0ea3192..0ea3192 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
index d8a12c6..7f0f93e 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java
@@ -582,6 +582,7 @@ public class ValueAnimator extends Animator {
          * active animations to process.
          */
         @Override
+        @SuppressWarnings("fallthrough")
         public void handleMessage(Message msg) {
             boolean callAgain = true;
             ArrayList<ValueAnimator> animations = sAnimations.get();
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
index 7b830b9..7b830b9 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
index 067d049..067d049 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
index 2c428e9..953e3e8 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java
@@ -9,18 +9,10 @@ import com.actionbarsherlock.internal.nineoldandroids.view.animation.AnimatorPro
 public class NineFrameLayout extends FrameLayout {
     private final AnimatorProxy mProxy;
 
-    public NineFrameLayout(Context context) {
-        super(context);
-        mProxy = AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : null;
-    }
     public NineFrameLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         mProxy = AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : null;
     }
-    public NineFrameLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        mProxy = AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : null;
-    }
 
     @Override
     public void setVisibility(int visibility) {
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
index 129b5aa..129b5aa 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java
diff --git a/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
index a670b1f..1f38101 100644..100755
--- a/library/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java
@@ -9,18 +9,10 @@ import com.actionbarsherlock.internal.nineoldandroids.view.animation.AnimatorPro
 public class NineLinearLayout extends LinearLayout {
     private final AnimatorProxy mProxy;
 
-    public NineLinearLayout(Context context) {
-        super(context);
-        mProxy = AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : null;
-    }
     public NineLinearLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
         mProxy = AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : null;
     }
-    public NineLinearLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        mProxy = AnimatorProxy.NEEDS_PROXY ? AnimatorProxy.wrap(this) : null;
-    }
 
     @Override
     public void setVisibility(int visibility) {
diff --git a/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
index b136d50..b136d50 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java
diff --git a/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
index 0a87bd3..0a87bd3 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java
diff --git a/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
index 7d45e81..7d45e81 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java
diff --git a/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
index 3869d32..3869d32 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
index 0354ad1..0354ad1 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
index 510b974..510b974 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
index dcb50f3..7d36c3b 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java
@@ -37,6 +37,7 @@ import com.actionbarsherlock.R;
 import com.actionbarsherlock.internal.view.View_HasStateListenerSupport;
 import com.actionbarsherlock.internal.view.View_OnAttachStateChangeListener;
 import com.actionbarsherlock.internal.widget.CapitalizingButton;
+import com.actionbarsherlock.internal.widget.IcsToast;
 
 import static com.actionbarsherlock.internal.ResourcesCompat.getResources_getBoolean;
 
@@ -263,7 +264,7 @@ public class ActionMenuItemView extends LinearLayout
         final int midy = screenPos[1] + height / 2;
         final int screenWidth = context.getResources().getDisplayMetrics().widthPixels;
 
-        Toast cheatSheet = Toast.makeText(context, mItemData.getTitle(), Toast.LENGTH_SHORT);
+        Toast cheatSheet = IcsToast.makeText(context, mItemData.getTitle(), IcsToast.LENGTH_SHORT);
         if (midy < displayFrame.height()) {
             // Show along the top; follow action buttons
             cheatSheet.setGravity(Gravity.TOP | Gravity.RIGHT,
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
index 6f568c6..876a22c 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java
@@ -23,7 +23,6 @@ import java.util.Set;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.content.res.TypedArray;
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -119,14 +118,6 @@ public class ActionMenuPresenter extends BaseMenuPresenter
     }
 
     public static boolean reserveOverflow(Context context) {
-        //Check for theme-forced overflow action item
-        TypedArray a = context.getTheme().obtainStyledAttributes(R.styleable.SherlockTheme);
-        boolean result = a.getBoolean(R.styleable.SherlockTheme_absForceOverflow, false);
-        a.recycle();
-        if (result) {
-            return true;
-        }
-
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
             return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB);
         } else {
@@ -621,6 +612,8 @@ public class ActionMenuPresenter extends BaseMenuPresenter
             for (View_OnAttachStateChangeListener listener : mListeners) {
                 listener.onViewDetachedFromWindow(this);
             }
+
+            if (mOverflowPopup != null) mOverflowPopup.dismiss();
         }
 
         @Override
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
index e090677..0e3b1ae 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java
@@ -520,6 +520,9 @@ public class ActionMenuView extends IcsLinearLayout implements MenuBuilder.ItemI
 
     //@Override
     protected boolean hasDividerBeforeChildAt(int childIndex) {
+        if (childIndex == 0) {
+            return false;
+        }
         final View childBefore = getChildAt(childIndex - 1);
         final View child = getChildAt(childIndex);
         boolean result = false;
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
index 6da26f2..6da26f2 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
index ac25c37..ac25c37 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
index 179b8f0..51bacd7 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java
@@ -31,6 +31,7 @@ import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.SparseArray;
@@ -353,6 +354,11 @@ public class MenuBuilder implements Menu {
         SparseArray<Parcelable> viewStates = states.getSparseParcelableArray(
                 getActionViewStatesKey());
 
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB && viewStates == null) {
+            //Fixes Issue #652 with sdk <= 2.3.6
+            return;
+        }
+
         final int itemCount = size();
         for (int i = 0; i < itemCount; i++) {
             final MenuItem item = getItem(i);
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
index f5359fb..f5359fb 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
index 907a7aa..aaf2997 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java
@@ -2,10 +2,12 @@ package com.actionbarsherlock.internal.view.menu;
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.view.View;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.View;
 import com.actionbarsherlock.internal.view.ActionProviderWrapper;
+import com.actionbarsherlock.internal.widget.CollapsibleActionViewWrapper;
 import com.actionbarsherlock.view.ActionProvider;
+import com.actionbarsherlock.view.CollapsibleActionView;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.SubMenu;
 
@@ -215,19 +217,35 @@ public class MenuItemWrapper implements MenuItem, android.view.MenuItem.OnMenuIt
 
     @Override
     public MenuItem setActionView(View view) {
+        if (view != null && view instanceof CollapsibleActionView) {
+            view = new CollapsibleActionViewWrapper(view);
+        }
         mNativeItem.setActionView(view);
         return this;
     }
 
     @Override
     public MenuItem setActionView(int resId) {
+        //Allow the native menu to inflate the resource
         mNativeItem.setActionView(resId);
+        if (resId != 0) {
+            //Get newly created view
+            View view = mNativeItem.getActionView();
+            if (view instanceof CollapsibleActionView) {
+                //Wrap it and re-set it
+                mNativeItem.setActionView(new CollapsibleActionViewWrapper(view));
+            }
+        }
         return this;
     }
 
     @Override
     public View getActionView() {
-        return mNativeItem.getActionView();
+        View actionView = mNativeItem.getActionView();
+        if (actionView instanceof CollapsibleActionViewWrapper) {
+            return ((CollapsibleActionViewWrapper)actionView).unwrap();
+        }
+        return actionView;
     }
 
     @Override
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
index f030de3..f030de3 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
index c3f3547..c3f3547 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
index 323ba2d..323ba2d 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
index 64fc4ae..4eb8d09 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
@@ -79,21 +79,33 @@ public class MenuWrapper implements Menu {
 
     @Override
     public int addIntentOptions(int groupId, int itemId, int order, ComponentName caller, Intent[] specifics, Intent intent, int flags, MenuItem[] outSpecificItems) {
-        android.view.MenuItem[] nativeOutItems = new android.view.MenuItem[outSpecificItems.length];
-        int result = mNativeMenu.addIntentOptions(groupId, itemId, order, caller, specifics, intent, flags, nativeOutItems);
-        for (int i = 0, length = outSpecificItems.length; i < length; i++) {
-            outSpecificItems[i] = new MenuItemWrapper(nativeOutItems[i]);
+        int result;
+        if (outSpecificItems != null) {
+            android.view.MenuItem[] nativeOutItems = new android.view.MenuItem[outSpecificItems.length];
+            result = mNativeMenu.addIntentOptions(groupId, itemId, order, caller, specifics, intent, flags, nativeOutItems);
+            for (int i = 0, length = outSpecificItems.length; i < length; i++) {
+                outSpecificItems[i] = new MenuItemWrapper(nativeOutItems[i]);
+            }
+        } else {
+            result = mNativeMenu.addIntentOptions(groupId, itemId, order, caller, specifics, intent, flags, null);
         }
         return result;
     }
 
     @Override
     public void removeItem(int id) {
+        mNativeMap.remove(mNativeMenu.findItem(id));
         mNativeMenu.removeItem(id);
     }
 
     @Override
     public void removeGroup(int groupId) {
+        for (int i = 0; i < mNativeMenu.size(); i++) {
+            final android.view.MenuItem item = mNativeMenu.getItem(i);
+            if (item.getGroupId() == groupId) {
+                mNativeMap.remove(item);
+            }
+        }
         mNativeMenu.removeGroup(groupId);
     }
 
@@ -103,6 +115,20 @@ public class MenuWrapper implements Menu {
         mNativeMenu.clear();
     }
 
+    public void invalidate() {
+        if (mNativeMap.isEmpty()) return;
+
+        final WeakHashMap<android.view.MenuItem, MenuItem> menuMapCopy = new WeakHashMap<android.view.MenuItem, MenuItem>(mNativeMap.size());
+
+        for (int i = 0; i < mNativeMenu.size(); i++) {
+            final android.view.MenuItem item = mNativeMenu.getItem(i);
+            menuMapCopy.put(item, mNativeMap.get(item));
+        }
+
+        mNativeMap.clear();
+        mNativeMap.putAll(menuMapCopy);
+    }
+
     @Override
     public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
         mNativeMenu.setGroupCheckable(group, checkable, exclusive);
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
index 6679cf3..6679cf3 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java
diff --git a/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
index 7d307ac..7d307ac 100644..100755
--- a/library/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java
diff --git a/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
index 3a4a446..3a4a446 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java
diff --git a/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
index 5e5aa28..0889825 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java
@@ -19,12 +19,13 @@ package com.actionbarsherlock.internal.widget;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-
 import com.actionbarsherlock.R;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout;
@@ -60,6 +61,11 @@ public class ActionBarContainer extends NineFrameLayout {
         mStackedBackground = a.getDrawable(
                 R.styleable.SherlockActionBar_backgroundStacked);
 
+        //Fix for issue #379
+        if (mStackedBackground instanceof ColorDrawable && Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+            mStackedBackground = new IcsColorDrawable((ColorDrawable) mStackedBackground);
+        }
+
         if (getId() == R.id.abs__split_action_bar) {
             mIsSplit = true;
             mSplitBackground = a.getDrawable(
diff --git a/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
index 9ec250f..9ec250f 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java
diff --git a/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
index 4636de1..61e55b0 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/ActionBarView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java
@@ -16,16 +16,14 @@
 
 package com.actionbarsherlock.internal.widget;
 
-import org.xmlpull.v1.XmlPullParser;
+import com.actionbarsherlock.internal.ResourcesCompat;
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Parcel;
@@ -49,7 +47,6 @@ import android.widget.TextView;
 import com.actionbarsherlock.R;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
-import com.actionbarsherlock.internal.ActionBarSherlockCompat;
 import com.actionbarsherlock.internal.view.menu.ActionMenuItem;
 import com.actionbarsherlock.internal.view.menu.ActionMenuPresenter;
 import com.actionbarsherlock.internal.view.menu.ActionMenuView;
@@ -70,7 +67,6 @@ import static com.actionbarsherlock.internal.ResourcesCompat.getResources_getBoo
  */
 public class ActionBarView extends AbsActionBarView {
     private static final String TAG = "ActionBarView";
-    private static final boolean DEBUG = false;
 
     /**
      * Display options applied by default
@@ -190,7 +186,7 @@ public class ActionBarView extends AbsActionBarView {
                 if (context instanceof Activity) {
                     //Even though native methods existed in API 9 and 10 they don't work
                     //so just parse the manifest to look for the logo pre-Honeycomb
-                    final int resId = loadLogoFromManifest((Activity) context);
+                    final int resId = ResourcesCompat.loadLogoFromManifest((Activity) context);
                     if (resId != 0) {
                         mLogo = context.getResources().getDrawable(resId);
                     }
@@ -265,85 +261,6 @@ public class ActionBarView extends AbsActionBarView {
         mHomeLayout.setFocusable(true);
     }
 
-    /**
-     * Attempt to programmatically load the logo from the manifest file of an
-     * activity by using an XML pull parser. This should allow us to read the
-     * logo attribute regardless of the platform it is being run on.
-     *
-     * @param activity Activity instance.
-     * @return Logo resource ID.
-     */
-    private static int loadLogoFromManifest(Activity activity) {
-        int logo = 0;
-        try {
-            final String thisPackage = activity.getClass().getName();
-            if (DEBUG) Log.i(TAG, "Parsing AndroidManifest.xml for " + thisPackage);
-
-            final String packageName = activity.getApplicationInfo().packageName;
-            final AssetManager am = activity.createPackageContext(packageName, 0).getAssets();
-            final XmlResourceParser xml = am.openXmlResourceParser("AndroidManifest.xml");
-
-            int eventType = xml.getEventType();
-            while (eventType != XmlPullParser.END_DOCUMENT) {
-                if (eventType == XmlPullParser.START_TAG) {
-                    String name = xml.getName();
-
-                    if ("application".equals(name)) {
-                        //Check if the <application> has the attribute
-                        if (DEBUG) Log.d(TAG, "Got <application>");
-
-                        for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
-                            if (DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
-
-                            if ("logo".equals(xml.getAttributeName(i))) {
-                                logo = xml.getAttributeResourceValue(i, 0);
-                                break; //out of for loop
-                            }
-                        }
-                    } else if ("activity".equals(name)) {
-                        //Check if the <activity> is us and has the attribute
-                        if (DEBUG) Log.d(TAG, "Got <activity>");
-                        Integer activityLogo = null;
-                        String activityPackage = null;
-                        boolean isOurActivity = false;
-
-                        for (int i = xml.getAttributeCount() - 1; i >= 0; i--) {
-                            if (DEBUG) Log.d(TAG, xml.getAttributeName(i) + ": " + xml.getAttributeValue(i));
-
-                            //We need both uiOptions and name attributes
-                            String attrName = xml.getAttributeName(i);
-                            if ("logo".equals(attrName)) {
-                                activityLogo = xml.getAttributeResourceValue(i, 0);
-                            } else if ("name".equals(attrName)) {
-                                activityPackage = ActionBarSherlockCompat.cleanActivityName(packageName, xml.getAttributeValue(i));
-                                if (!thisPackage.equals(activityPackage)) {
-                                    break; //on to the next
-                                }
-                                isOurActivity = true;
-                            }
-
-                            //Make sure we have both attributes before processing
-                            if ((activityLogo != null) && (activityPackage != null)) {
-                                //Our activity, logo specified, override with our value
-                                logo = activityLogo.intValue();
-                            }
-                        }
-                        if (isOurActivity) {
-                            //If we matched our activity but it had no logo don't
-                            //do any more processing of the manifest
-                            break;
-                        }
-                    }
-                }
-                eventType = xml.nextToken();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (DEBUG) Log.i(TAG, "Returning " + Integer.toHexString(logo));
-        return logo;
-    }
-
     /*
      * Must be public so we can dispatch pre-2.2 via ActionBarImpl.
      */
diff --git a/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
index fa3698f..6a134a1 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java
@@ -29,7 +29,12 @@ public class CapitalizingButton extends Button {
     public void setTextCompat(CharSequence text) {
         if (SANS_ICE_CREAM && mAllCaps && text != null) {
             if (IS_GINGERBREAD) {
-                setText(text.toString().toUpperCase(Locale.ROOT));
+                try {
+                    setText(text.toString().toUpperCase(Locale.ROOT));
+                } catch (NoSuchFieldError e) {
+                    //Some manufacturer broke Locale.ROOT. See #572.
+                    setText(text.toString().toUpperCase());
+                }
             } else {
                 setText(text.toString().toUpperCase());
             }
diff --git a/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
index 673ec55..cae8b8a 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java
@@ -1,12 +1,13 @@
 package com.actionbarsherlock.internal.widget;
 
-import java.util.Locale;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
+import java.util.Locale;
+
 public class CapitalizingTextView extends TextView {
     private static final boolean SANS_ICE_CREAM = Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH;
     private static final boolean IS_GINGERBREAD = Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD;
@@ -33,7 +34,12 @@ public class CapitalizingTextView extends TextView {
     public void setTextCompat(CharSequence text) {
         if (SANS_ICE_CREAM && mAllCaps && text != null) {
             if (IS_GINGERBREAD) {
-                setText(text.toString().toUpperCase(Locale.ROOT));
+                try {
+                    setText(text.toString().toUpperCase(Locale.ROOT));
+                } catch (NoSuchFieldError e) {
+                    //Some manufacturer broke Locale.ROOT. See #572.
+                    setText(text.toString().toUpperCase());
+                }
             } else {
                 setText(text.toString().toUpperCase());
             }
diff --git a/actionbarsherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
new file mode 100755
index 0000000..14f092c
--- /dev/null
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java
@@ -0,0 +1,30 @@
+package com.actionbarsherlock.internal.widget;
+
+import android.view.View;
+import android.widget.FrameLayout;
+import com.actionbarsherlock.view.CollapsibleActionView;
+
+/**
+ * Wraps an ABS collapsible action view in a native container that delegates the calls.
+ */
+public class CollapsibleActionViewWrapper extends FrameLayout implements android.view.CollapsibleActionView {
+    private final CollapsibleActionView child;
+
+    public CollapsibleActionViewWrapper(View child) {
+        super(child.getContext());
+        this.child = (CollapsibleActionView) child;
+        addView(child);
+    }
+
+    @Override public void onActionViewExpanded() {
+        child.onActionViewExpanded();
+    }
+
+    @Override public void onActionViewCollapsed() {
+        child.onActionViewCollapsed();
+    }
+
+    public View unwrap() {
+        return getChildAt(0);
+    }
+}
diff --git a/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
index ce0cb3b..ce0cb3b 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java
diff --git a/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
index c786dc5..c786dc5 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java
diff --git a/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
new file mode 100755
index 0000000..3e022e6
--- /dev/null
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java
@@ -0,0 +1,51 @@
+package com.actionbarsherlock.internal.widget;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+
+/**
+ * A version of {@link android.graphics.drawable.ColorDrawable} that respects bounds.
+ */
+public class IcsColorDrawable extends Drawable {
+    private int color;
+    private final Paint paint = new Paint();
+
+    public IcsColorDrawable(ColorDrawable drawable) {
+        Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+        Canvas c = new Canvas(bitmap);
+        drawable.draw(c);
+        this.color = bitmap.getPixel(0, 0);
+        bitmap.recycle();
+    }
+
+    public IcsColorDrawable(int color) {
+        this.color = color;
+    }
+
+    @Override public void draw(Canvas canvas) {
+        if ((color >>> 24) != 0) {
+            paint.setColor(color);
+            canvas.drawRect(getBounds(), paint);
+        }
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        if (alpha != (color >>> 24)) {
+            color = (color & 0x00FFFFFF) | (alpha << 24);
+            invalidateSelf();
+        }
+    }
+
+    @Override public void setColorFilter(ColorFilter colorFilter) {
+        //Ignored
+    }
+
+    @Override public int getOpacity() {
+        return color >>> 24;
+    }
+}
diff --git a/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
index 1b4463a..b7c6ff3 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java
@@ -3,9 +3,12 @@ package com.actionbarsherlock.internal.widget;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
+
 import com.actionbarsherlock.internal.nineoldandroids.widget.NineLinearLayout;
 
 /**
@@ -16,10 +19,10 @@ import com.actionbarsherlock.internal.nineoldandroids.widget.NineLinearLayout;
  * {@link android.widget.FrameLayout} so it can receive the margin.
  */
 public class IcsLinearLayout extends NineLinearLayout {
-    private static final int[] LinearLayout = new int[] {
+    private static final int[] R_styleable_LinearLayout = new int[] {
         /* 0 */ android.R.attr.divider,
-        /* 1 */ android.R.attr.showDividers,
-        /* 2 */ android.R.attr.dividerPadding,
+        /* 2 */ android.R.attr.showDividers,
+        /* 3 */ android.R.attr.dividerPadding,
     };
     private static final int LinearLayout_divider = 0;
     private static final int LinearLayout_showDividers = 1;
@@ -49,11 +52,10 @@ public class IcsLinearLayout extends NineLinearLayout {
     private int mShowDividers;
     private int mDividerPadding;
 
-
     public IcsLinearLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        TypedArray a = context.obtainStyledAttributes(attrs, /*com.android.internal.R.styleable.*/LinearLayout);
+        TypedArray a = context.obtainStyledAttributes(attrs, /*com.android.internal.R.styleable.*/R_styleable_LinearLayout);
 
         setDividerDrawable(a.getDrawable(/*com.android.internal.R.styleable.*/LinearLayout_divider));
         mShowDividers = a.getInt(/*com.android.internal.R.styleable.*/LinearLayout_showDividers, SHOW_DIVIDER_NONE);
@@ -94,6 +96,12 @@ public class IcsLinearLayout extends NineLinearLayout {
         if (divider == mDivider) {
             return;
         }
+
+        //Fix for issue #379
+        if (divider instanceof ColorDrawable && Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
+            divider = new IcsColorDrawable((ColorDrawable) divider);
+        }
+
         mDivider = divider;
         if (divider != null) {
             mDividerWidth = divider.getIntrinsicWidth();
@@ -199,7 +207,7 @@ public class IcsLinearLayout extends NineLinearLayout {
             if (child == null) {
                 bottom = getHeight() - getPaddingBottom() - mDividerHeight;
             } else {
-                final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+                //final LayoutParams lp = (LayoutParams) child.getLayoutParams();
                 bottom = child.getBottom()/* + lp.bottomMargin*/;
             }
             drawHorizontalDivider(canvas, bottom);
@@ -226,7 +234,7 @@ public class IcsLinearLayout extends NineLinearLayout {
             if (child == null) {
                 right = getWidth() - getPaddingRight() - mDividerWidth;
             } else {
-                final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+                //final LayoutParams lp = (LayoutParams) child.getLayoutParams();
                 right = child.getRight()/* + lp.rightMargin*/;
             }
             drawVerticalDivider(canvas, right);
diff --git a/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
index d13c6ce..5da8318 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java
@@ -258,6 +258,23 @@ public class IcsListPopupWindow {
         mPopup.setInputMethodMode(mode);
     }
 
+    /**
+     * Set the selected position of the list.
+     * Only valid when {@link #isShowing()} == {@code true}.
+     *
+     * @param position List position to set as selected.
+     */
+    public void setSelection(int position) {
+        DropDownListView list = mDropDownList;
+        if (isShowing() && list != null) {
+            list.mListSelectionHidden = false;
+            list.setSelection(position);
+            if (list.getChoiceMode() != ListView.CHOICE_MODE_NONE) {
+                list.setItemChecked(position, true);
+            }
+        }
+    }
+
     public void clearListSelection() {
         final DropDownListView list = mDropDownList;
         if (list != null) {
diff --git a/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
index 1c02d4a..1c02d4a 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java
diff --git a/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
index 038d1e0..038d1e0 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java
diff --git a/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsToast.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsToast.java
new file mode 100755
index 0000000..042648b
--- /dev/null
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsToast.java
@@ -0,0 +1,60 @@
+
+package com.actionbarsherlock.internal.widget;
+
+import android.content.Context;
+import android.util.Log;
+import android.view.Gravity;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.actionbarsherlock.R;
+
+public class IcsToast extends Toast {
+    public static final int LENGTH_LONG = Toast.LENGTH_LONG;
+    public static final int LENGTH_SHORT = Toast.LENGTH_SHORT;
+    private static final String TAG = "Toast";
+
+    public static Toast makeText(Context context, CharSequence s, int duration) {
+        if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
+            return Toast.makeText(context, s, duration);
+        }
+        IcsToast toast = new IcsToast(context);
+        toast.setDuration(duration);
+        TextView view = new TextView(context);
+        view.setText(s);
+        // Original AOSP using reference on @android:color/bright_foreground_dark
+        // bright_foreground_dark - reference on @android:color/background_light
+        // background_light - 0xffffffff
+        view.setTextColor(0xffffffff);
+        view.setGravity(Gravity.CENTER);
+        view.setBackgroundResource(R.drawable.abs__toast_frame);
+        toast.setView(view);
+        return toast;
+    }
+
+    public static Toast makeText(Context context, int resId, int duration) {
+        return makeText(context, context.getResources().getString(resId), duration);
+    }
+
+    public IcsToast(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void setText(CharSequence s) {
+        if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
+            super.setText(s);
+            return;
+        }
+        if (getView() == null) {
+            return;
+        }
+        try {
+            ((TextView) getView()).setText(s);
+        } catch (ClassCastException e) {
+            Log.e(TAG, "This Toast was not created with IcsToast.makeText", e);
+        }
+    }
+}
diff --git a/library/src/com/actionbarsherlock/internal/widget/IcsView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
index a7185d0..a7185d0 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/IcsView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/IcsView.java
diff --git a/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
index 1a532e0..eb178e0 100644..100755
--- a/library/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java
@@ -186,8 +186,9 @@ public class ScrollingTabContainerView extends NineHorizontalScrollView
     }
 
     private IcsLinearLayout createTabLayout() {
-        final IcsLinearLayout tabLayout = (IcsLinearLayout) LayoutInflater.from(getContext())
+        final TabsLinearLayout tabLayout = (TabsLinearLayout) LayoutInflater.from(getContext())
                 .inflate(R.layout.abs__action_bar_tab_bar_view, null);
+        tabLayout.setMeasureWithLargestChildEnabled(true);
         tabLayout.setLayoutParams(new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT));
         return tabLayout;
diff --git a/actionbarsherlock/src/com/actionbarsherlock/internal/widget/TabsLinearLayout.java b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/TabsLinearLayout.java
new file mode 100755
index 0000000..03d09b1
--- /dev/null
+++ b/actionbarsherlock/src/com/actionbarsherlock/internal/widget/TabsLinearLayout.java
@@ -0,0 +1,113 @@
+package com.actionbarsherlock.internal.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+
+public class TabsLinearLayout extends IcsLinearLayout {
+    private static final int[] R_styleable_LinearLayout = new int[] {
+            /* 0 */ android.R.attr.measureWithLargestChild,
+    };
+    private static final int LinearLayout_measureWithLargestChild = 0;
+
+    private boolean mUseLargestChild;
+
+    public TabsLinearLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, /*com.android.internal.R.styleable.*/R_styleable_LinearLayout);
+        mUseLargestChild = a.getBoolean(/*com.android.internal.R.styleable.*/LinearLayout_measureWithLargestChild, false);
+
+        a.recycle();
+    }
+
+    /**
+     * When true, all children with a weight will be considered having
+     * the minimum size of the largest child. If false, all children are
+     * measured normally.
+     *
+     * @return True to measure children with a weight using the minimum
+     *         size of the largest child, false otherwise.
+     *
+     * @attr ref android.R.styleable#LinearLayout_measureWithLargestChild
+     */
+    public boolean isMeasureWithLargestChildEnabled() {
+        return mUseLargestChild;
+    }
+
+    /**
+     * When set to true, all children with a weight will be considered having
+     * the minimum size of the largest child. If false, all children are
+     * measured normally.
+     *
+     * Disabled by default.
+     *
+     * @param enabled True to measure children with a weight using the
+     *        minimum size of the largest child, false otherwise.
+     *
+     * @attr ref android.R.styleable#LinearLayout_measureWithLargestChild
+     */
+    public void setMeasureWithLargestChildEnabled(boolean enabled) {
+        mUseLargestChild = enabled;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        final int childCount = getChildCount();
+        if (childCount <= 2) return;
+
+        final int mode = MeasureSpec.getMode(widthMeasureSpec);
+        if (mUseLargestChild && mode == MeasureSpec.UNSPECIFIED) {
+            final int orientation = getOrientation();
+            if (orientation == HORIZONTAL) {
+                useLargestChildHorizontal();
+            }
+        }
+    }
+
+    private void useLargestChildHorizontal() {
+        final int childCount = getChildCount();
+
+        // Find largest child width
+        int largestChildWidth = 0;
+        for (int i = 0; i < childCount; i++) {
+            final View child = getChildAt(i);
+            largestChildWidth = Math.max(child.getMeasuredWidth(), largestChildWidth);
+        }
+
+        int totalWidth = 0;
+        // Re-measure childs
+        for (int i = 0; i < childCount; i++) {
+            final View child = getChildAt(i);
+
+            if (child == null || child.getVisibility() == View.GONE) {
+                continue;
+            }
+
+            final LinearLayout.LayoutParams lp =
+                    (LinearLayout.LayoutParams) child.getLayoutParams();
+
+            float childExtra = lp.weight;
+            if (childExtra > 0) {
+                child.measure(
+                        MeasureSpec.makeMeasureSpec(largestChildWidth,
+                                MeasureSpec.EXACTLY),
+                        MeasureSpec.makeMeasureSpec(child.getMeasuredHeight(),
+                                MeasureSpec.EXACTLY));
+                totalWidth += largestChildWidth;
+
+            } else {
+                totalWidth += child.getMeasuredWidth();
+            }
+
+            totalWidth += lp.leftMargin + lp.rightMargin;
+        }
+
+        totalWidth += getPaddingLeft() + getPaddingRight();
+        setMeasuredDimension(totalWidth, getMeasuredHeight());
+    }
+}
diff --git a/library/src/com/actionbarsherlock/view/ActionMode.java b/actionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
index 81b4cd4..81b4cd4 100644..100755
--- a/library/src/com/actionbarsherlock/view/ActionMode.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/ActionMode.java
diff --git a/library/src/com/actionbarsherlock/view/ActionProvider.java b/actionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
index ae7cb1f..ae7cb1f 100644..100755
--- a/library/src/com/actionbarsherlock/view/ActionProvider.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/ActionProvider.java
diff --git a/library/src/com/actionbarsherlock/view/CollapsibleActionView.java b/actionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
index 43281b0..43281b0 100644..100755
--- a/library/src/com/actionbarsherlock/view/CollapsibleActionView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java
diff --git a/library/src/com/actionbarsherlock/view/Menu.java b/actionbarsherlock/src/com/actionbarsherlock/view/Menu.java
index 951f4cc..951f4cc 100644..100755
--- a/library/src/com/actionbarsherlock/view/Menu.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/Menu.java
diff --git a/library/src/com/actionbarsherlock/view/MenuInflater.java b/actionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
index 9694597..5a0f408 100644..100755
--- a/library/src/com/actionbarsherlock/view/MenuInflater.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/MenuInflater.java
@@ -67,6 +67,7 @@ public class MenuInflater {
     private final Object[] mActionProviderConstructorArguments;

 

     private Context mContext;

+    private Object mRealOwner;

 

     /**

      * Constructs a menu inflater.

@@ -75,6 +76,20 @@ public class MenuInflater {
      */

     public MenuInflater(Context context) {

         mContext = context;

+        mRealOwner = context;

+        mActionViewConstructorArguments = new Object[] {context};

+        mActionProviderConstructorArguments = mActionViewConstructorArguments;

+    }

+

+    /**

+     * Constructs a menu inflater.

+     *

+     * @see Activity#getMenuInflater()

+     * @hide

+     */

+    public MenuInflater(Context context, Object realOwner) {

+        mContext = context;

+        mRealOwner = realOwner;

         mActionViewConstructorArguments = new Object[] {context};

         mActionProviderConstructorArguments = mActionViewConstructorArguments;

     }

@@ -192,12 +207,12 @@ public class MenuInflater {
             implements MenuItem.OnMenuItemClickListener {

         private static final Class<?>[] PARAM_TYPES = new Class[] { MenuItem.class };

 

-        private Context mContext;

+        private Object mRealOwner;

         private Method mMethod;

 

-        public InflatedOnMenuItemClickListener(Context context, String methodName) {

-            mContext = context;

-            Class<?> c = context.getClass();

+        public InflatedOnMenuItemClickListener(Object realOwner, String methodName) {

+            mRealOwner = realOwner;

+            Class<?> c = realOwner.getClass();

             try {

                 mMethod = c.getMethod(methodName, PARAM_TYPES);

             } catch (Exception e) {

@@ -212,9 +227,9 @@ public class MenuInflater {
         public boolean onMenuItemClick(MenuItem item) {

             try {

                 if (mMethod.getReturnType() == Boolean.TYPE) {

-                    return (Boolean) mMethod.invoke(mContext, item);

+                    return (Boolean) mMethod.invoke(mRealOwner, item);

                 } else {

-                    mMethod.invoke(mContext, item);

+                    mMethod.invoke(mRealOwner, item);

                     return true;

                 }

             } catch (Exception e) {

@@ -358,8 +373,16 @@ public class MenuInflater {
 

             itemListenerMethodName = a.getString(R.styleable.SherlockMenuItem_android_onClick);

             itemActionViewLayout = a.getResourceId(R.styleable.SherlockMenuItem_android_actionLayout, 0);

-            itemActionViewClassName = a.getString(R.styleable.SherlockMenuItem_android_actionViewClass);

-            itemActionProviderClassName = a.getString(R.styleable.SherlockMenuItem_android_actionProviderClass);

+

+            // itemActionViewClassName = a.getString(R.styleable.SherlockMenuItem_android_actionViewClass);

+            value = new TypedValue();

+            a.getValue(R.styleable.SherlockMenuItem_android_actionViewClass, value);

+            itemActionViewClassName = value.type == TypedValue.TYPE_STRING ? value.string.toString() : null;

+

+            // itemActionProviderClassName = a.getString(R.styleable.SherlockMenuItem_android_actionProviderClass);

+            value = new TypedValue();

+            a.getValue(R.styleable.SherlockMenuItem_android_actionProviderClass, value);

+            itemActionProviderClassName = value.type == TypedValue.TYPE_STRING ? value.string.toString() : null;

 

             final boolean hasActionProvider = itemActionProviderClassName != null;

             if (hasActionProvider && itemActionViewLayout == 0 && itemActionViewClassName == null) {

@@ -407,7 +430,7 @@ public class MenuInflater {
                             + "be used within a restricted context");

                 }

                 item.setOnMenuItemClickListener(

-                        new InflatedOnMenuItemClickListener(mContext, itemListenerMethodName));

+                        new InflatedOnMenuItemClickListener(mRealOwner, itemListenerMethodName));

             }

 

             if (itemCheckable >= 2) {

diff --git a/library/src/com/actionbarsherlock/view/MenuItem.java b/actionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
index 7fc3aa4..7fc3aa4 100644..100755
--- a/library/src/com/actionbarsherlock/view/MenuItem.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/MenuItem.java
diff --git a/library/src/com/actionbarsherlock/view/SubMenu.java b/actionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
index 397fd1c..397fd1c 100644..100755
--- a/library/src/com/actionbarsherlock/view/SubMenu.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/SubMenu.java
diff --git a/library/src/com/actionbarsherlock/view/Window.java b/actionbarsherlock/src/com/actionbarsherlock/view/Window.java
index a340a42..a340a42 100644..100755
--- a/library/src/com/actionbarsherlock/view/Window.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/view/Window.java
diff --git a/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/actionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
index 3792074..d7f110f 100644..100755
--- a/library/src/com/actionbarsherlock/widget/ActivityChooserModel.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java
@@ -25,7 +25,6 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
-
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlSerializer;
@@ -39,11 +38,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 /**
  * <p>
@@ -562,33 +561,7 @@ class ActivityChooserModel extends DataSetObservable {
         }
     }
 
-    private static final SerialExecutor SERIAL_EXECUTOR = new SerialExecutor();
-
-    private static class SerialExecutor implements Executor {
-        final LinkedList<Runnable> mTasks = new LinkedList<Runnable>();
-        Runnable mActive;
-
-        public synchronized void execute(final Runnable r) {
-            mTasks.offer(new Runnable() {
-                public void run() {
-                    try {
-                        r.run();
-                    } finally {
-                        scheduleNext();
-                    }
-                }
-            });
-            if (mActive == null) {
-                scheduleNext();
-            }
-        }
-
-        protected synchronized void scheduleNext() {
-            if ((mActive = mTasks.poll()) != null) {
-                mActive.run();
-            }
-        }
-    }
+    private static final Executor SERIAL_EXECUTOR = Executors.newSingleThreadExecutor();
 
     /**
      * Persists the history data to the backing file if the latter
diff --git a/library/src/com/actionbarsherlock/widget/ActivityChooserView.java b/actionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
index da13bc9..7eb7330 100644..100755
--- a/library/src/com/actionbarsherlock/widget/ActivityChooserView.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java
@@ -395,7 +395,11 @@ class ActivityChooserView extends ViewGroup implements ActivityChooserModelClien
         super.onAttachedToWindow();
         ActivityChooserModel dataModel = mAdapter.getDataModel();
         if (dataModel != null) {
-            dataModel.registerObserver(mModelDataSetOberver);
+            try {
+                dataModel.registerObserver(mModelDataSetOberver);
+            } catch (IllegalStateException e) {
+                // Related to #557.
+            }
         }
         mIsAttachedToWindow = true;
     }
@@ -405,7 +409,11 @@ class ActivityChooserView extends ViewGroup implements ActivityChooserModelClien
         super.onDetachedFromWindow();
         ActivityChooserModel dataModel = mAdapter.getDataModel();
         if (dataModel != null) {
-            dataModel.unregisterObserver(mModelDataSetOberver);
+            try {
+                dataModel.unregisterObserver(mModelDataSetOberver);
+            } catch (IllegalStateException e) {
+                //Oh, well... fixes issue #557
+            }
         }
         ViewTreeObserver viewTreeObserver = getViewTreeObserver();
         if (viewTreeObserver.isAlive()) {
@@ -518,6 +526,9 @@ class ActivityChooserView extends ViewGroup implements ActivityChooserModelClien
                         mDefaultActionButtonContentDescription, label);
                 mDefaultActivityButton.setContentDescription(contentDescription);
             }
+
+            // Work-around for #415.
+            mAdapter.setShowDefaultActivity(false, false);
         } else {
             mDefaultActivityButton.setVisibility(View.GONE);
         }
@@ -526,6 +537,7 @@ class ActivityChooserView extends ViewGroup implements ActivityChooserModelClien
             mActivityChooserContent.setBackgroundDrawable(mActivityChooserContentBackground);
         } else {
             mActivityChooserContent.setBackgroundDrawable(null);
+            mActivityChooserContent.setPadding(0, 0, 0, 0);
         }
     }
 
@@ -639,7 +651,8 @@ class ActivityChooserView extends ViewGroup implements ActivityChooserModelClien
 
         private int mMaxActivityCount = MAX_ACTIVITY_COUNT_DEFAULT;
 
-        private boolean mShowDefaultActivity;
+        // Work-around for #415.
+        private boolean mShowDefaultActivity = true;
 
         private boolean mHighlightDefaultActivity;
 
@@ -648,11 +661,19 @@ class ActivityChooserView extends ViewGroup implements ActivityChooserModelClien
         public void setDataModel(ActivityChooserModel dataModel) {
             ActivityChooserModel oldDataModel = mAdapter.getDataModel();
             if (oldDataModel != null && isShown()) {
-                oldDataModel.unregisterObserver(mModelDataSetOberver);
+                try {
+                    oldDataModel.unregisterObserver(mModelDataSetOberver);
+                } catch (IllegalStateException e) {
+                    //Oh, well... fixes issue #557
+                }
             }
             mDataModel = dataModel;
             if (dataModel != null && isShown()) {
-                dataModel.registerObserver(mModelDataSetOberver);
+                try {
+                    dataModel.registerObserver(mModelDataSetOberver);
+                } catch (IllegalStateException e) {
+                    // Related to #557.
+                }
             }
             notifyDataSetChanged();
         }
diff --git a/actionbarsherlock/src/com/actionbarsherlock/widget/SearchView.java b/actionbarsherlock/src/com/actionbarsherlock/widget/SearchView.java
new file mode 100755
index 0000000..fb83196
--- /dev/null
+++ b/actionbarsherlock/src/com/actionbarsherlock/widget/SearchView.java
@@ -0,0 +1,1811 @@
+/*
+ * 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.
+ */
+
+package com.actionbarsherlock.widget;
+
+import android.app.PendingIntent;
+import android.app.SearchManager;
+import android.app.SearchableInfo;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.database.Cursor;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.speech.RecognizerIntent;
+import android.support.v4.view.KeyEventCompat;
+import android.support.v4.widget.CursorAdapter;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.text.style.ImageSpan;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.AutoCompleteTextView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+import com.actionbarsherlock.R;
+import com.actionbarsherlock.view.CollapsibleActionView;
+
+import java.lang.reflect.Method;
+import java.util.WeakHashMap;
+
+import static com.actionbarsherlock.widget.SuggestionsAdapter.getColumnString;
+
+/**
+ * A widget that provides a user interface for the user to enter a search query and submit a request
+ * to a search provider. Shows a list of query suggestions or results, if available, and allows the
+ * user to pick a suggestion or result to launch into.
+ *
+ * <p>
+ * When the SearchView is used in an ActionBar as an action view for a collapsible menu item, it
+ * needs to be set to iconified by default using {@link #setIconifiedByDefault(boolean)
+ * setIconifiedByDefault(true)}. This is the default, so nothing needs to be done.
+ * </p>
+ * <p>
+ * If you want the search field to always be visible, then call setIconifiedByDefault(false).
+ * </p>
+ *
+ * <div class="special reference">
+ * <h3>Developer Guides</h3>
+ * <p>For information about using {@code SearchView}, read the
+ * <a href="{@docRoot}guide/topics/search/index.html">Search</a> developer guide.</p>
+ * </div>
+ *
+ * @see android.view.MenuItem#SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW
+ * @attr ref android.R.styleable#SearchView_iconifiedByDefault
+ * @attr ref android.R.styleable#SearchView_imeOptions
+ * @attr ref android.R.styleable#SearchView_inputType
+ * @attr ref android.R.styleable#SearchView_maxWidth
+ * @attr ref android.R.styleable#SearchView_queryHint
+ */
+public class SearchView extends LinearLayout implements CollapsibleActionView {
+
+    private static final boolean DBG = false;
+    private static final String LOG_TAG = "SearchView";
+
+    /**
+     * Private constant for removing the microphone in the keyboard.
+     */
+    private static final String IME_OPTION_NO_MICROPHONE = "nm";
+
+    private OnQueryTextListener mOnQueryChangeListener;
+    private OnCloseListener mOnCloseListener;
+    private OnFocusChangeListener mOnQueryTextFocusChangeListener;
+    private OnSuggestionListener mOnSuggestionListener;
+    private OnClickListener mOnSearchClickListener;
+
+    private boolean mIconifiedByDefault;
+    private boolean mIconified;
+    private CursorAdapter mSuggestionsAdapter;
+    private View mSearchButton;
+    private View mSubmitButton;
+    private View mSearchPlate;
+    private View mSubmitArea;
+    private ImageView mCloseButton;
+    private View mSearchEditFrame;
+    private View mVoiceButton;
+    private SearchAutoComplete mQueryTextView;
+    private View mDropDownAnchor;
+    private ImageView mSearchHintIcon;
+    private boolean mSubmitButtonEnabled;
+    private CharSequence mQueryHint;
+    private boolean mQueryRefinement;
+    private boolean mClearingFocus;
+    private int mMaxWidth;
+    private boolean mVoiceButtonEnabled;
+    private CharSequence mOldQueryText;
+    private CharSequence mUserQuery;
+    private boolean mExpandedInActionView;
+    private int mCollapsedImeOptions;
+
+    private SearchableInfo mSearchable;
+    private Bundle mAppSearchData;
+
+    /*
+    * SearchView can be set expanded before the IME is ready to be shown during
+    * initial UI setup. The show operation is asynchronous to account for this.
+    */
+    private Runnable mShowImeRunnable = new Runnable() {
+        public void run() {
+            InputMethodManager imm = (InputMethodManager)
+                    getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+
+            if (imm != null) {
+                showSoftInputUnchecked(SearchView.this, imm, 0);
+            }
+        }
+    };
+
+    private Runnable mUpdateDrawableStateRunnable = new Runnable() {
+        public void run() {
+            updateFocusedState();
+        }
+    };
+
+    private Runnable mReleaseCursorRunnable = new Runnable() {
+        public void run() {
+            if (mSuggestionsAdapter != null && mSuggestionsAdapter instanceof SuggestionsAdapter) {
+                mSuggestionsAdapter.changeCursor(null);
+            }
+        }
+    };
+
+    // For voice searching
+    private final Intent mVoiceWebSearchIntent;
+    private final Intent mVoiceAppSearchIntent;
+
+    // A weak map of drawables we've gotten from other packages, so we don't load them
+    // more than once.
+    private final WeakHashMap<String, Drawable.ConstantState> mOutsideDrawablesCache =
+            new WeakHashMap<String, Drawable.ConstantState>();
+
+    /**
+     * Callbacks for changes to the query text.
+     */
+    public interface OnQueryTextListener {
+
+        /**
+         * Called when the user submits the query. This could be due to a key press on the
+         * keyboard or due to pressing a submit button.
+         * The listener can override the standard behavior by returning true
+         * to indicate that it has handled the submit request. Otherwise return false to
+         * let the SearchView handle the submission by launching any associated intent.
+         *
+         * @param query the query text that is to be submitted
+         *
+         * @return true if the query has been handled by the listener, false to let the
+         * SearchView perform the default action.
+         */
+        boolean onQueryTextSubmit(String query);
+
+        /**
+         * Called when the query text is changed by the user.
+         *
+         * @param newText the new content of the query text field.
+         *
+         * @return false if the SearchView should perform the default action of showing any
+         * suggestions if available, true if the action was handled by the listener.
+         */
+        boolean onQueryTextChange(String newText);
+    }
+
+    public interface OnCloseListener {
+
+        /**
+         * The user is attempting to close the SearchView.
+         *
+         * @return true if the listener wants to override the default behavior of clearing the
+         * text field and dismissing it, false otherwise.
+         */
+        boolean onClose();
+    }
+
+    /**
+     * Callback interface for selection events on suggestions. These callbacks
+     * are only relevant when a SearchableInfo has been specified by {@link #setSearchableInfo}.
+     */
+    public interface OnSuggestionListener {
+
+        /**
+         * Called when a suggestion was selected by navigating to it.
+         * @param position the absolute position in the list of suggestions.
+         *
+         * @return true if the listener handles the event and wants to override the default
+         * behavior of possibly rewriting the query based on the selected item, false otherwise.
+         */
+        boolean onSuggestionSelect(int position);
+
+        /**
+         * Called when a suggestion was clicked.
+         * @param position the absolute position of the clicked item in the list of suggestions.
+         *
+         * @return true if the listener handles the event and wants to override the default
+         * behavior of launching any intent or submitting a search query specified on that item.
+         * Return false otherwise.
+         */
+        boolean onSuggestionClick(int position);
+    }
+
+    public SearchView(Context context) {
+        this(context, null);
+    }
+
+    public SearchView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) {
+            throw new IllegalStateException("SearchView is API 8+ only.");
+        }
+
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        inflater.inflate(R.layout.abs__search_view, this, true);
+
+        mSearchButton = findViewById(R.id.abs__search_button);
+        mQueryTextView = (SearchAutoComplete) findViewById(R.id.abs__search_src_text);
+        mQueryTextView.setSearchView(this);
+
+        mSearchEditFrame = findViewById(R.id.abs__search_edit_frame);
+        mSearchPlate = findViewById(R.id.abs__search_plate);
+        mSubmitArea = findViewById(R.id.abs__submit_area);
+        mSubmitButton = findViewById(R.id.abs__search_go_btn);
+        mCloseButton = (ImageView) findViewById(R.id.abs__search_close_btn);
+        mVoiceButton = findViewById(R.id.abs__search_voice_btn);
+        mSearchHintIcon = (ImageView) findViewById(R.id.abs__search_mag_icon);
+
+        mSearchButton.setOnClickListener(mOnClickListener);
+        mCloseButton.setOnClickListener(mOnClickListener);
+        mSubmitButton.setOnClickListener(mOnClickListener);
+        mVoiceButton.setOnClickListener(mOnClickListener);
+        mQueryTextView.setOnClickListener(mOnClickListener);
+
+        mQueryTextView.addTextChangedListener(mTextWatcher);
+        mQueryTextView.setOnEditorActionListener(mOnEditorActionListener);
+        mQueryTextView.setOnItemClickListener(mOnItemClickListener);
+        mQueryTextView.setOnItemSelectedListener(mOnItemSelectedListener);
+        mQueryTextView.setOnKeyListener(mTextKeyListener);
+        // Inform any listener of focus changes
+        mQueryTextView.setOnFocusChangeListener(new OnFocusChangeListener() {
+
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (mOnQueryTextFocusChangeListener != null) {
+                    mOnQueryTextFocusChangeListener.onFocusChange(SearchView.this, hasFocus);
+                }
+            }
+        });
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SherlockSearchView, 0, 0);
+        setIconifiedByDefault(a.getBoolean(R.styleable.SherlockSearchView_iconifiedByDefault, true));
+        int maxWidth = a.getDimensionPixelSize(R.styleable.SherlockSearchView_android_maxWidth, -1);
+        if (maxWidth != -1) {
+            setMaxWidth(maxWidth);
+        }
+        CharSequence queryHint = a.getText(R.styleable.SherlockSearchView_queryHint);
+        if (!TextUtils.isEmpty(queryHint)) {
+            setQueryHint(queryHint);
+        }
+        int imeOptions = a.getInt(R.styleable.SherlockSearchView_android_imeOptions, -1);
+        if (imeOptions != -1) {
+            setImeOptions(imeOptions);
+        }
+        int inputType = a.getInt(R.styleable.SherlockSearchView_android_inputType, -1);
+        if (inputType != -1) {
+            setInputType(inputType);
+        }
+
+        a.recycle();
+
+        boolean focusable = true;
+
+        a = context.obtainStyledAttributes(attrs, R.styleable.SherlockView, 0, 0);
+        focusable = a.getBoolean(R.styleable.SherlockView_android_focusable, focusable);
+        a.recycle();
+        setFocusable(focusable);
+
+        // Save voice intent for later queries/launching
+        mVoiceWebSearchIntent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH);
+        mVoiceWebSearchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mVoiceWebSearchIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+            RecognizerIntent.LANGUAGE_MODEL_WEB_SEARCH);
+
+        mVoiceAppSearchIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
+        mVoiceAppSearchIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        mDropDownAnchor = findViewById(mQueryTextView.getDropDownAnchor());
+        if (mDropDownAnchor != null) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+                mDropDownAnchor.addOnLayoutChangeListener(new OnLayoutChangeListener() {
+                    @Override
+                    public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                                                                         int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                        adjustDropDownSizeAndPosition();
+                    }
+                });
+            } else {
+                mDropDownAnchor.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+                    @Override public void onGlobalLayout() {
+                        adjustDropDownSizeAndPosition();
+                    }
+                });
+            }
+        }
+
+        updateViewsVisibility(mIconifiedByDefault);
+        updateQueryHint();
+    }
+
+    /**
+     * Sets the SearchableInfo for this SearchView. Properties in the SearchableInfo are used
+     * to display labels, hints, suggestions, create intents for launching search results screens
+     * and controlling other affordances such as a voice button.
+     *
+     * @param searchable a SearchableInfo can be retrieved from the SearchManager, for a specific
+     * activity or a global search provider.
+     */
+    public void setSearchableInfo(SearchableInfo searchable) {
+        mSearchable = searchable;
+        if (mSearchable != null) {
+            updateSearchAutoComplete();
+            updateQueryHint();
+        }
+        // Cache the voice search capability
+        mVoiceButtonEnabled = hasVoiceSearch();
+
+        if (mVoiceButtonEnabled) {
+            // Disable the microphone on the keyboard, as a mic is displayed near the text box
+            // TODO: use imeOptions to disable voice input when the new API will be available
+            mQueryTextView.setPrivateImeOptions(IME_OPTION_NO_MICROPHONE);
+        }
+        updateViewsVisibility(isIconified());
+    }
+
+    /**
+     * Sets the APP_DATA for legacy SearchDialog use.
+     * @param appSearchData bundle provided by the app when launching the search dialog
+     * @hide
+     */
+    public void setAppSearchData(Bundle appSearchData) {
+        mAppSearchData = appSearchData;
+    }
+
+    /**
+     * Sets the IME options on the query text field.
+     *
+     * @see TextView#setImeOptions(int)
+     * @param imeOptions the options to set on the query text field
+     *
+     * @attr ref android.R.styleable#SearchView_imeOptions
+     */
+    public void setImeOptions(int imeOptions) {
+        mQueryTextView.setImeOptions(imeOptions);
+    }
+
+    /**
+     * Returns the IME options set on the query text field.
+     * @return the ime options
+     * @see TextView#setImeOptions(int)
+     *
+     * @attr ref android.R.styleable#SearchView_imeOptions
+     */
+    public int getImeOptions() {
+        return mQueryTextView.getImeOptions();
+    }
+
+    /**
+     * Sets the input type on the query text field.
+     *
+     * @see TextView#setInputType(int)
+     * @param inputType the input type to set on the query text field
+     *
+     * @attr ref android.R.styleable#SearchView_inputType
+     */
+    public void setInputType(int inputType) {
+        mQueryTextView.setInputType(inputType);
+    }
+
+    /**
+     * Returns the input type set on the query text field.
+     * @return the input type
+     *
+     * @attr ref android.R.styleable#SearchView_inputType
+     */
+    public int getInputType() {
+        return mQueryTextView.getInputType();
+    }
+
+    /** @hide */
+    @Override
+    public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
+        // Don't accept focus if in the middle of clearing focus
+        if (mClearingFocus) return false;
+        // Check if SearchView is focusable.
+        if (!isFocusable()) return false;
+        // If it is not iconified, then give the focus to the text field
+        if (!isIconified()) {
+            boolean result = mQueryTextView.requestFocus(direction, previouslyFocusedRect);
+            if (result) {
+                updateViewsVisibility(false);
+            }
+            return result;
+        } else {
+            return super.requestFocus(direction, previouslyFocusedRect);
+        }
+    }
+
+    /** @hide */
+    @Override
+    public void clearFocus() {
+        mClearingFocus = true;
+        setImeVisibility(false);
+        super.clearFocus();
+        mQueryTextView.clearFocus();
+        mClearingFocus = false;
+    }
+
+    /**
+     * Sets a listener for user actions within the SearchView.
+     *
+     * @param listener the listener object that receives callbacks when the user performs
+     * actions in the SearchView such as clicking on buttons or typing a query.
+     */
+    public void setOnQueryTextListener(OnQueryTextListener listener) {
+        mOnQueryChangeListener = listener;
+    }
+
+    /**
+     * Sets a listener to inform when the user closes the SearchView.
+     *
+     * @param listener the listener to call when the user closes the SearchView.
+     */
+    public void setOnCloseListener(OnCloseListener listener) {
+        mOnCloseListener = listener;
+    }
+
+    /**
+     * Sets a listener to inform when the focus of the query text field changes.
+     *
+     * @param listener the listener to inform of focus changes.
+     */
+    public void setOnQueryTextFocusChangeListener(OnFocusChangeListener listener) {
+        mOnQueryTextFocusChangeListener = listener;
+    }
+
+    /**
+     * Sets a listener to inform when a suggestion is focused or clicked.
+     *
+     * @param listener the listener to inform of suggestion selection events.
+     */
+    public void setOnSuggestionListener(OnSuggestionListener listener) {
+        mOnSuggestionListener = listener;
+    }
+
+    /**
+     * Sets a listener to inform when the search button is pressed. This is only
+     * relevant when the text field is not visible by default. Calling {@link #setIconified
+     * setIconified(false)} can also cause this listener to be informed.
+     *
+     * @param listener the listener to inform when the search button is clicked or
+     * the text field is programmatically de-iconified.
+     */
+    public void setOnSearchClickListener(OnClickListener listener) {
+        mOnSearchClickListener = listener;
+    }
+
+    /**
+     * Returns the query string currently in the text field.
+     *
+     * @return the query string
+     */
+    public CharSequence getQuery() {
+        return mQueryTextView.getText();
+    }
+
+    /**
+     * Sets a query string in the text field and optionally submits the query as well.
+     *
+     * @param query the query string. This replaces any query text already present in the
+     * text field.
+     * @param submit whether to submit the query right now or only update the contents of
+     * text field.
+     */
+    public void setQuery(CharSequence query, boolean submit) {
+        mQueryTextView.setText(query);
+        if (query != null) {
+            mQueryTextView.setSelection(mQueryTextView.length());
+            mUserQuery = query;
+        }
+
+        // If the query is not empty and submit is requested, submit the query
+        if (submit && !TextUtils.isEmpty(query)) {
+            onSubmitQuery();
+        }
+    }
+
+    /**
+     * Sets the hint text to display in the query text field. This overrides any hint specified
+     * in the SearchableInfo.
+     *
+     * @param hint the hint text to display
+     *
+     * @attr ref android.R.styleable#SearchView_queryHint
+     */
+    public void setQueryHint(CharSequence hint) {
+        mQueryHint = hint;
+        updateQueryHint();
+    }
+
+    /**
+     * Gets the hint text to display in the query text field.
+     * @return the query hint text, if specified, null otherwise.
+     *
+     * @attr ref android.R.styleable#SearchView_queryHint
+     */
+    public CharSequence getQueryHint() {
+        if (mQueryHint != null) {
+            return mQueryHint;
+        } else if (mSearchable != null) {
+            CharSequence hint = null;
+            int hintId = mSearchable.getHintId();
+            if (hintId != 0) {
+                hint = getContext().getString(hintId);
+            }
+            return hint;
+        }
+        return null;
+    }
+
+    /**
+     * Sets the default or resting state of the search field. If true, a single search icon is
+     * shown by default and expands to show the text field and other buttons when pressed. Also,
+     * if the default state is iconified, then it collapses to that state when the close button
+     * is pressed. Changes to this property will take effect immediately.
+     *
+     * <p>The default value is true.</p>
+     *
+     * @param iconified whether the search field should be iconified by default
+     *
+     * @attr ref android.R.styleable#SearchView_iconifiedByDefault
+     */
+    public void setIconifiedByDefault(boolean iconified) {
+        if (mIconifiedByDefault == iconified) return;
+        mIconifiedByDefault = iconified;
+        updateViewsVisibility(iconified);
+        updateQueryHint();
+    }
+
+    /**
+     * Returns the default iconified state of the search field.
+     * @return
+     *
+     * @attr ref android.R.styleable#SearchView_iconifiedByDefault
+     */
+    public boolean isIconfiedByDefault() {
+        return mIconifiedByDefault;
+    }
+
+    /**
+     * Iconifies or expands the SearchView. Any query text is cleared when iconified. This is
+     * a temporary state and does not override the default iconified state set by
+     * {@link #setIconifiedByDefault(boolean)}. If the default state is iconified, then
+     * a false here will only be valid until the user closes the field. And if the default
+     * state is expanded, then a true here will only clear the text field and not close it.
+     *
+     * @param iconify a true value will collapse the SearchView to an icon, while a false will
+     * expand it.
+     */
+    public void setIconified(boolean iconify) {
+        if (iconify) {
+            onCloseClicked();
+        } else {
+            onSearchClicked();
+        }
+    }
+
+    /**
+     * Returns the current iconified state of the SearchView.
+     *
+     * @return true if the SearchView is currently iconified, false if the search field is
+     * fully visible.
+     */
+    public boolean isIconified() {
+        return mIconified;
+    }
+
+    /**
+     * Enables showing a submit button when the query is non-empty. In cases where the SearchView
+     * is being used to filter the contents of the current activity and doesn't launch a separate
+     * results activity, then the submit button should be disabled.
+     *
+     * @param enabled true to show a submit button for submitting queries, false if a submit
+     * button is not required.
+     */
+    public void setSubmitButtonEnabled(boolean enabled) {
+        mSubmitButtonEnabled = enabled;
+        updateViewsVisibility(isIconified());
+    }
+
+    /**
+     * Returns whether the submit button is enabled when necessary or never displayed.
+     *
+     * @return whether the submit button is enabled automatically when necessary
+     */
+    public boolean isSubmitButtonEnabled() {
+        return mSubmitButtonEnabled;
+    }
+
+    /**
+     * Specifies if a query refinement button should be displayed alongside each suggestion
+     * or if it should depend on the flags set in the individual items retrieved from the
+     * suggestions provider. Clicking on the query refinement button will replace the text
+     * in the query text field with the text from the suggestion. This flag only takes effect
+     * if a SearchableInfo has been specified with {@link #setSearchableInfo(SearchableInfo)}
+     * and not when using a custom adapter.
+     *
+     * @param enable true if all items should have a query refinement button, false if only
+     * those items that have a query refinement flag set should have the button.
+     *
+     * @see SearchManager#SUGGEST_COLUMN_FLAGS
+     * @see SearchManager#FLAG_QUERY_REFINEMENT
+     */
+    public void setQueryRefinementEnabled(boolean enable) {
+        mQueryRefinement = enable;
+        if (mSuggestionsAdapter instanceof SuggestionsAdapter) {
+            ((SuggestionsAdapter) mSuggestionsAdapter).setQueryRefinement(
+                    enable ? SuggestionsAdapter.REFINE_ALL : SuggestionsAdapter.REFINE_BY_ENTRY);
+        }
+    }
+
+    /**
+     * Returns whether query refinement is enabled for all items or only specific ones.
+     * @return true if enabled for all items, false otherwise.
+     */
+    public boolean isQueryRefinementEnabled() {
+        return mQueryRefinement;
+    }
+
+    /**
+     * You can set a custom adapter if you wish. Otherwise the default adapter is used to
+     * display the suggestions from the suggestions provider associated with the SearchableInfo.
+     *
+     * @see #setSearchableInfo(SearchableInfo)
+     */
+    public void setSuggestionsAdapter(CursorAdapter adapter) {
+        mSuggestionsAdapter = adapter;
+
+        mQueryTextView.setAdapter(mSuggestionsAdapter);
+    }
+
+    /**
+     * Returns the adapter used for suggestions, if any.
+     * @return the suggestions adapter
+     */
+    public CursorAdapter getSuggestionsAdapter() {
+        return mSuggestionsAdapter;
+    }
+
+    /**
+     * Makes the view at most this many pixels wide
+     *
+     * @attr ref android.R.styleable#SearchView_maxWidth
+     */
+    public void setMaxWidth(int maxpixels) {
+        mMaxWidth = maxpixels;
+
+        requestLayout();
+    }
+
+    /**
+     * Gets the specified maximum width in pixels, if set. Returns zero if
+     * no maximum width was specified.
+     * @return the maximum width of the view
+     *
+     * @attr ref android.R.styleable#SearchView_maxWidth
+     */
+    public int getMaxWidth() {
+        return mMaxWidth;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        // Let the standard measurements take effect in iconified state.
+        if (isIconified()) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            return;
+        }
+
+        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+        int width = MeasureSpec.getSize(widthMeasureSpec);
+
+        switch (widthMode) {
+            case MeasureSpec.AT_MOST:
+                // If there is an upper limit, don't exceed maximum width (explicit or implicit)
+                if (mMaxWidth > 0) {
+                    width = Math.min(mMaxWidth, width);
+                } else {
+                    width = Math.min(getPreferredWidth(), width);
+                }
+                break;
+            case MeasureSpec.EXACTLY:
+                // If an exact width is specified, still don't exceed any specified maximum width
+                if (mMaxWidth > 0) {
+                    width = Math.min(mMaxWidth, width);
+                }
+                break;
+            case MeasureSpec.UNSPECIFIED:
+                // Use maximum width, if specified, else preferred width
+                width = mMaxWidth > 0 ? mMaxWidth : getPreferredWidth();
+                break;
+        }
+        widthMode = MeasureSpec.EXACTLY;
+        super.onMeasure(MeasureSpec.makeMeasureSpec(width, widthMode), heightMeasureSpec);
+    }
+
+    private int getPreferredWidth() {
+        return getContext().getResources()
+                .getDimensionPixelSize(R.dimen.abs__search_view_preferred_width);
+    }
+
+    private void updateViewsVisibility(final boolean collapsed) {
+        mIconified = collapsed;
+        // Visibility of views that are visible when collapsed
+        final int visCollapsed = collapsed ? VISIBLE : GONE;
+        // Is there text in the query
+        final boolean hasText = !TextUtils.isEmpty(mQueryTextView.getText());
+
+        mSearchButton.setVisibility(visCollapsed);
+        updateSubmitButton(hasText);
+        mSearchEditFrame.setVisibility(collapsed ? GONE : VISIBLE);
+        mSearchHintIcon.setVisibility(mIconifiedByDefault ? GONE : VISIBLE);
+        updateCloseButton();
+        updateVoiceButton(!hasText);
+        updateSubmitArea();
+    }
+
+    private boolean hasVoiceSearch() {
+        if (mSearchable != null && mSearchable.getVoiceSearchEnabled()) {
+            Intent testIntent = null;
+            if (mSearchable.getVoiceSearchLaunchWebSearch()) {
+                testIntent = mVoiceWebSearchIntent;
+            } else if (mSearchable.getVoiceSearchLaunchRecognizer()) {
+                testIntent = mVoiceAppSearchIntent;
+            }
+            if (testIntent != null) {
+                ResolveInfo ri = getContext().getPackageManager().resolveActivity(testIntent,
+                        PackageManager.MATCH_DEFAULT_ONLY);
+                return ri != null;
+            }
+        }
+        return false;
+    }
+
+    private boolean isSubmitAreaEnabled() {
+        return (mSubmitButtonEnabled || mVoiceButtonEnabled) && !isIconified();
+    }
+
+    private void updateSubmitButton(boolean hasText) {
+        int visibility = GONE;
+        if (mSubmitButtonEnabled && isSubmitAreaEnabled() && hasFocus()
+                && (hasText || !mVoiceButtonEnabled)) {
+            visibility = VISIBLE;
+        }
+        mSubmitButton.setVisibility(visibility);
+    }
+
+    private void updateSubmitArea() {
+        int visibility = GONE;
+        if (isSubmitAreaEnabled()
+                && (mSubmitButton.getVisibility() == VISIBLE
+                        || mVoiceButton.getVisibility() == VISIBLE)) {
+            visibility = VISIBLE;
+        }
+        mSubmitArea.setVisibility(visibility);
+    }
+
+    private void updateCloseButton() {
+        final boolean hasText = !TextUtils.isEmpty(mQueryTextView.getText());
+        // Should we show the close button? It is not shown if there's no focus,
+        // field is not iconified by default and there is no text in it.
+        final boolean showClose = hasText || (mIconifiedByDefault && !mExpandedInActionView);
+        mCloseButton.setVisibility(showClose ? VISIBLE : GONE);
+        mCloseButton.getDrawable().setState(hasText ? ENABLED_STATE_SET : EMPTY_STATE_SET);
+    }
+
+    private void postUpdateFocusedState() {
+        post(mUpdateDrawableStateRunnable);
+    }
+
+    private void updateFocusedState() {
+        boolean focused = mQueryTextView.hasFocus();
+        mSearchPlate.getBackground().setState(focused ? FOCUSED_STATE_SET : EMPTY_STATE_SET);
+        mSubmitArea.getBackground().setState(focused ? FOCUSED_STATE_SET : EMPTY_STATE_SET);
+        invalidate();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        removeCallbacks(mUpdateDrawableStateRunnable);
+        post(mReleaseCursorRunnable);
+        super.onDetachedFromWindow();
+    }
+
+    private void setImeVisibility(final boolean visible) {
+        if (visible) {
+            post(mShowImeRunnable);
+        } else {
+            removeCallbacks(mShowImeRunnable);
+            InputMethodManager imm = (InputMethodManager)
+                    getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+
+            if (imm != null) {
+                imm.hideSoftInputFromWindow(getWindowToken(), 0);
+            }
+        }
+    }
+
+    /**
+     * Called by the SuggestionsAdapter
+     * @hide
+     */
+    /* package */void onQueryRefine(CharSequence queryText) {
+        setQuery(queryText);
+    }
+
+    private final OnClickListener mOnClickListener = new OnClickListener() {
+
+        public void onClick(View v) {
+            if (v == mSearchButton) {
+                onSearchClicked();
+            } else if (v == mCloseButton) {
+                onCloseClicked();
+            } else if (v == mSubmitButton) {
+                onSubmitQuery();
+            } else if (v == mVoiceButton) {
+                onVoiceClicked();
+            } else if (v == mQueryTextView) {
+                forceSuggestionQuery();
+            }
+        }
+    };
+
+    /**
+     * Handles the key down event for dealing with action keys.
+     *
+     * @param keyCode This is the keycode of the typed key, and is the same value as
+     *        found in the KeyEvent parameter.
+     * @param event The complete event record for the typed key
+     *
+     * @return true if the event was handled here, or false if not.
+     */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (mSearchable == null) {
+            return false;
+        }
+
+        // if it's an action specified by the searchable activity, launch the
+        // entered query with the action key
+        // TODO SearchableInfo.ActionKeyInfo actionKey = mSearchable.findActionKey(keyCode);
+        // TODO if ((actionKey != null) && (actionKey.getQueryActionMsg() != null)) {
+        // TODO     launchQuerySearch(keyCode, actionKey.getQueryActionMsg(), mQueryTextView.getText()
+        // TODO             .toString());
+        // TODO     return true;
+        // TODO }
+
+        return super.onKeyDown(keyCode, event);
+    }
+
+    /**
+     * React to the user typing "enter" or other hardwired keys while typing in
+     * the search box. This handles these special keys while the edit box has
+     * focus.
+     */
+    View.OnKeyListener mTextKeyListener = new View.OnKeyListener() {
+        public boolean onKey(View v, int keyCode, KeyEvent event) {
+            // guard against possible race conditions
+            if (mSearchable == null) {
+                return false;
+            }
+
+            if (DBG) {
+                Log.d(LOG_TAG, "mTextListener.onKey(" + keyCode + "," + event + "), selection: "
+                        + mQueryTextView.getListSelection());
+            }
+
+            // If a suggestion is selected, handle enter, search key, and action keys
+            // as presses on the selected suggestion
+            if (mQueryTextView.isPopupShowing()
+                    && mQueryTextView.getListSelection() != ListView.INVALID_POSITION) {
+                return onSuggestionsKey(v, keyCode, event);
+            }
+
+            // If there is text in the query box, handle enter, and action keys
+            // The search key is handled by the dialog's onKeyDown().
+            if (!mQueryTextView.isEmpty() && KeyEventCompat.hasNoModifiers(event)) {
+                if (event.getAction() == KeyEvent.ACTION_UP) {
+                    if (keyCode == KeyEvent.KEYCODE_ENTER) {
+                        v.cancelLongPress();
+
+                        // Launch as a regular search.
+                        launchQuerySearch(KeyEvent.KEYCODE_UNKNOWN, null, mQueryTextView.getText()
+                                .toString());
+                        return true;
+                    }
+                }
+                if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                    // TODO SearchableInfo.ActionKeyInfo actionKey = mSearchable.findActionKey(keyCode);
+                    // TODO if ((actionKey != null) && (actionKey.getQueryActionMsg() != null)) {
+                    // TODO     launchQuerySearch(keyCode, actionKey.getQueryActionMsg(), mQueryTextView
+                    // TODO             .getText().toString());
+                    // TODO     return true;
+                    // TODO }
+                }
+            }
+            return false;
+        }
+    };
+
+    /**
+     * React to the user typing while in the suggestions list. First, check for
+     * action keys. If not handled, try refocusing regular characters into the
+     * EditText.
+     */
+    private boolean onSuggestionsKey(View v, int keyCode, KeyEvent event) {
+        // guard against possible race conditions (late arrival after dismiss)
+        if (mSearchable == null) {
+            return false;
+        }
+        if (mSuggestionsAdapter == null) {
+            return false;
+        }
+        if (event.getAction() == KeyEvent.ACTION_DOWN && KeyEventCompat.hasNoModifiers(event)) {
+            // First, check for enter or search (both of which we'll treat as a
+            // "click")
+            if (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_SEARCH
+                    || keyCode == KeyEvent.KEYCODE_TAB) {
+                int position = mQueryTextView.getListSelection();
+                return onItemClicked(position, KeyEvent.KEYCODE_UNKNOWN, null);
+            }
+
+            // Next, check for left/right moves, which we use to "return" the
+            // user to the edit view
+            if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
+                // give "focus" to text editor, with cursor at the beginning if
+                // left key, at end if right key
+                // TODO: Reverse left/right for right-to-left languages, e.g.
+                // Arabic
+                int selPoint = (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) ? 0 : mQueryTextView
+                        .length();
+                mQueryTextView.setSelection(selPoint);
+                mQueryTextView.setListSelection(0);
+                mQueryTextView.clearListSelection();
+                ensureImeVisible(mQueryTextView, true);
+
+                return true;
+            }
+
+            // Next, check for an "up and out" move
+            if (keyCode == KeyEvent.KEYCODE_DPAD_UP && 0 == mQueryTextView.getListSelection()) {
+                // TODO: restoreUserQuery();
+                // let ACTV complete the move
+                return false;
+            }
+
+            // Next, check for an "action key"
+            // TODO SearchableInfo.ActionKeyInfo actionKey = mSearchable.findActionKey(keyCode);
+            // TODO if ((actionKey != null)
+            // TODO         && ((actionKey.getSuggestActionMsg() != null) || (actionKey
+            // TODO                 .getSuggestActionMsgColumn() != null))) {
+            // TODO     // launch suggestion using action key column
+            // TODO     int position = mQueryTextView.getListSelection();
+            // TODO     if (position != ListView.INVALID_POSITION) {
+            // TODO         Cursor c = mSuggestionsAdapter.getCursor();
+            // TODO         if (c.moveToPosition(position)) {
+            // TODO             final String actionMsg = getActionKeyMessage(c, actionKey);
+            // TODO             if (actionMsg != null && (actionMsg.length() > 0)) {
+            // TODO                 return onItemClicked(position, keyCode, actionMsg);
+            // TODO             }
+            // TODO         }
+            // TODO     }
+            // TODO }
+        }
+        return false;
+    }
+
+    /**
+     * For a given suggestion and a given cursor row, get the action message. If
+     * not provided by the specific row/column, also check for a single
+     * definition (for the action key).
+     *
+     * @param c The cursor providing suggestions
+     * @param actionKey The actionkey record being examined
+     *
+     * @return Returns a string, or null if no action key message for this
+     *         suggestion
+     */
+    // TODO private static String getActionKeyMessage(Cursor c, SearchableInfo.ActionKeyInfo actionKey) {
+    // TODO     String result = null;
+    // TODO     // check first in the cursor data, for a suggestion-specific message
+    // TODO     final String column = actionKey.getSuggestActionMsgColumn();
+    // TODO     if (column != null) {
+    // TODO         result = SuggestionsAdapter.getColumnString(c, column);
+    // TODO     }
+    // TODO     // If the cursor didn't give us a message, see if there's a single
+    // TODO     // message defined
+    // TODO     // for the actionkey (for all suggestions)
+    // TODO     if (result == null) {
+    // TODO         result = actionKey.getSuggestActionMsg();
+    // TODO     }
+    // TODO     return result;
+    // TODO }
+
+    private int getSearchIconId() {
+        TypedValue outValue = new TypedValue();
+        getContext().getTheme().resolveAttribute(R.attr.searchViewSearchIcon,
+                outValue, true);
+        return outValue.resourceId;
+    }
+
+    private CharSequence getDecoratedHint(CharSequence hintText) {
+        // If the field is always expanded, then don't add the search icon to the hint
+        if (!mIconifiedByDefault) return hintText;
+
+        SpannableStringBuilder ssb = new SpannableStringBuilder("   "); // for the icon
+        ssb.append(hintText);
+        Drawable searchIcon = getContext().getResources().getDrawable(getSearchIconId());
+        int textSize = (int) (mQueryTextView.getTextSize() * 1.25);
+        searchIcon.setBounds(0, 0, textSize, textSize);
+        ssb.setSpan(new ImageSpan(searchIcon), 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return ssb;
+    }
+
+    private void updateQueryHint() {
+        if (mQueryHint != null) {
+            mQueryTextView.setHint(getDecoratedHint(mQueryHint));
+        } else if (mSearchable != null) {
+            CharSequence hint = null;
+            int hintId = mSearchable.getHintId();
+            if (hintId != 0) {
+                hint = getContext().getString(hintId);
+            }
+            if (hint != null) {
+                mQueryTextView.setHint(getDecoratedHint(hint));
+            }
+        } else {
+            mQueryTextView.setHint(getDecoratedHint(""));
+        }
+    }
+
+    /**
+     * Updates the auto-complete text view.
+     */
+    private void updateSearchAutoComplete() {
+        // TODO mQueryTextView.setDropDownAnimationStyle(0); // no animation
+        mQueryTextView.setThreshold(mSearchable.getSuggestThreshold());
+        mQueryTextView.setImeOptions(mSearchable.getImeOptions());
+        int inputType = mSearchable.getInputType();
+        // We only touch this if the input type is set up for text (which it almost certainly
+        // should be, in the case of search!)
+        if ((inputType & InputType.TYPE_MASK_CLASS) == InputType.TYPE_CLASS_TEXT) {
+            // The existence of a suggestions authority is the proxy for "suggestions
+            // are available here"
+            inputType &= ~InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE;
+            if (mSearchable.getSuggestAuthority() != null) {
+                inputType |= InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE;
+                // TYPE_TEXT_FLAG_AUTO_COMPLETE means that the text editor is performing
+                // auto-completion based on its own semantics, which it will present to the user
+                // as they type. This generally means that the input method should not show its
+                // own candidates, and the spell checker should not be in action. The text editor
+                // supplies its candidates by calling InputMethodManager.displayCompletions(),
+                // which in turn will call InputMethodSession.displayCompletions().
+                inputType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
+            }
+        }
+        mQueryTextView.setInputType(inputType);
+        if (mSuggestionsAdapter != null) {
+            mSuggestionsAdapter.changeCursor(null);
+        }
+        // attach the suggestions adapter, if suggestions are available
+        // The existence of a suggestions authority is the proxy for "suggestions available here"
+        if (mSearchable.getSuggestAuthority() != null) {
+            mSuggestionsAdapter = new SuggestionsAdapter(getContext(),
+                    this, mSearchable, mOutsideDrawablesCache);
+            mQueryTextView.setAdapter(mSuggestionsAdapter);
+            ((SuggestionsAdapter) mSuggestionsAdapter).setQueryRefinement(
+                    mQueryRefinement ? SuggestionsAdapter.REFINE_ALL
+                    : SuggestionsAdapter.REFINE_BY_ENTRY);
+        }
+    }
+
+    /**
+     * Update the visibility of the voice button.  There are actually two voice search modes,
+     * either of which will activate the button.
+     * @param empty whether the search query text field is empty. If it is, then the other
+     * criteria apply to make the voice button visible.
+     */
+    private void updateVoiceButton(boolean empty) {
+        int visibility = GONE;
+        if (mVoiceButtonEnabled && !isIconified() && empty) {
+            visibility = VISIBLE;
+            mSubmitButton.setVisibility(GONE);
+        }
+        mVoiceButton.setVisibility(visibility);
+    }
+
+    private final OnEditorActionListener mOnEditorActionListener = new OnEditorActionListener() {
+
+        /**
+         * Called when the input method default action key is pressed.
+         */
+        public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+            onSubmitQuery();
+            return true;
+        }
+    };
+
+    private void onTextChanged(CharSequence newText) {
+        CharSequence text = mQueryTextView.getText();
+        mUserQuery = text;
+        boolean hasText = !TextUtils.isEmpty(text);
+        updateSubmitButton(hasText);
+        updateVoiceButton(!hasText);
+        updateCloseButton();
+        updateSubmitArea();
+        if (mOnQueryChangeListener != null && !TextUtils.equals(newText, mOldQueryText)) {
+            mOnQueryChangeListener.onQueryTextChange(newText.toString());
+        }
+        mOldQueryText = newText.toString();
+    }
+
+    private void onSubmitQuery() {
+        CharSequence query = mQueryTextView.getText();
+        if (query != null && TextUtils.getTrimmedLength(query) > 0) {
+            if (mOnQueryChangeListener == null
+                    || !mOnQueryChangeListener.onQueryTextSubmit(query.toString())) {
+                if (mSearchable != null) {
+                    launchQuerySearch(KeyEvent.KEYCODE_UNKNOWN, null, query.toString());
+                    setImeVisibility(false);
+                }
+                dismissSuggestions();
+            }
+        }
+    }
+
+    private void dismissSuggestions() {
+        mQueryTextView.dismissDropDown();
+    }
+
+    private void onCloseClicked() {
+        CharSequence text = mQueryTextView.getText();
+        if (TextUtils.isEmpty(text)) {
+            if (mIconifiedByDefault) {
+                // If the app doesn't override the close behavior
+                if (mOnCloseListener == null || !mOnCloseListener.onClose()) {
+                    // hide the keyboard and remove focus
+                    clearFocus();
+                    // collapse the search field
+                    updateViewsVisibility(true);
+                }
+            }
+        } else {
+            mQueryTextView.setText("");
+            mQueryTextView.requestFocus();
+            setImeVisibility(true);
+        }
+
+    }
+
+    private void onSearchClicked() {
+        updateViewsVisibility(false);
+        mQueryTextView.requestFocus();
+        setImeVisibility(true);
+        if (mOnSearchClickListener != null) {
+            mOnSearchClickListener.onClick(this);
+        }
+    }
+
+    private void onVoiceClicked() {
+        // guard against possible race conditions
+        if (mSearchable == null) {
+            return;
+        }
+        SearchableInfo searchable = mSearchable;
+        try {
+            if (searchable.getVoiceSearchLaunchWebSearch()) {
+                Intent webSearchIntent = createVoiceWebSearchIntent(mVoiceWebSearchIntent,
+                        searchable);
+                getContext().startActivity(webSearchIntent);
+            } else if (searchable.getVoiceSearchLaunchRecognizer()) {
+                Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent,
+                        searchable);
+                getContext().startActivity(appSearchIntent);
+            }
+        } catch (ActivityNotFoundException e) {
+            // Should not happen, since we check the availability of
+            // voice search before showing the button. But just in case...
+            Log.w(LOG_TAG, "Could not find voice search activity");
+        }
+    }
+
+    void onTextFocusChanged() {
+        updateViewsVisibility(isIconified());
+        // Delayed update to make sure that the focus has settled down and window focus changes
+        // don't affect it. A synchronous update was not working.
+        postUpdateFocusedState();
+        if (mQueryTextView.hasFocus()) {
+            forceSuggestionQuery();
+        }
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasWindowFocus) {
+        super.onWindowFocusChanged(hasWindowFocus);
+
+        postUpdateFocusedState();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onActionViewCollapsed() {
+        clearFocus();
+        updateViewsVisibility(true);
+        mQueryTextView.setImeOptions(mCollapsedImeOptions);
+        mExpandedInActionView = false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onActionViewExpanded() {
+        if (mExpandedInActionView) return;
+
+        mExpandedInActionView = true;
+        mCollapsedImeOptions = mQueryTextView.getImeOptions();
+        mQueryTextView.setImeOptions(mCollapsedImeOptions | EditorInfo.IME_FLAG_NO_FULLSCREEN);
+        mQueryTextView.setText("");
+        setIconified(false);
+    }
+
+    @Override
+    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
+        super.onInitializeAccessibilityEvent(event);
+        event.setClassName(SearchView.class.getName());
+    }
+
+    @Override
+    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
+        super.onInitializeAccessibilityNodeInfo(info);
+        info.setClassName(SearchView.class.getName());
+    }
+
+    private void adjustDropDownSizeAndPosition() {
+        if (mDropDownAnchor.getWidth() > 1) {
+            Resources res = getContext().getResources();
+            int anchorPadding = mSearchPlate.getPaddingLeft();
+            Rect dropDownPadding = new Rect();
+            int iconOffset = mIconifiedByDefault
+                    ? res.getDimensionPixelSize(R.dimen.abs__dropdownitem_icon_width)
+                    + res.getDimensionPixelSize(R.dimen.abs__dropdownitem_text_padding_left)
+                    : 0;
+            mQueryTextView.getDropDownBackground().getPadding(dropDownPadding);
+            mQueryTextView.setDropDownHorizontalOffset(-(dropDownPadding.left + iconOffset)
+                    + anchorPadding);
+            mQueryTextView.setDropDownWidth(mDropDownAnchor.getWidth() + dropDownPadding.left
+                    + dropDownPadding.right + iconOffset - (anchorPadding));
+        }
+    }
+
+    private boolean onItemClicked(int position, int actionKey, String actionMsg) {
+        if (mOnSuggestionListener == null
+                || !mOnSuggestionListener.onSuggestionClick(position)) {
+            launchSuggestion(position, KeyEvent.KEYCODE_UNKNOWN, null);
+            setImeVisibility(false);
+            dismissSuggestions();
+            return true;
+        }
+        return false;
+    }
+
+    private boolean onItemSelected(int position) {
+        if (mOnSuggestionListener == null
+                || !mOnSuggestionListener.onSuggestionSelect(position)) {
+            rewriteQueryFromSuggestion(position);
+            return true;
+        }
+        return false;
+    }
+
+    private final OnItemClickListener mOnItemClickListener = new OnItemClickListener() {
+
+        /**
+         * Implements OnItemClickListener
+         */
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            if (DBG) Log.d(LOG_TAG, "onItemClick() position " + position);
+            onItemClicked(position, KeyEvent.KEYCODE_UNKNOWN, null);
+        }
+    };
+
+    private final OnItemSelectedListener mOnItemSelectedListener = new OnItemSelectedListener() {
+
+        /**
+         * Implements OnItemSelectedListener
+         */
+        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+            if (DBG) Log.d(LOG_TAG, "onItemSelected() position " + position);
+            SearchView.this.onItemSelected(position);
+        }
+
+        /**
+         * Implements OnItemSelectedListener
+         */
+        public void onNothingSelected(AdapterView<?> parent) {
+            if (DBG)
+                Log.d(LOG_TAG, "onNothingSelected()");
+        }
+    };
+
+    /**
+     * Query rewriting.
+     */
+    private void rewriteQueryFromSuggestion(int position) {
+        CharSequence oldQuery = mQueryTextView.getText();
+        Cursor c = mSuggestionsAdapter.getCursor();
+        if (c == null) {
+            return;
+        }
+        if (c.moveToPosition(position)) {
+            // Get the new query from the suggestion.
+            CharSequence newQuery = mSuggestionsAdapter.convertToString(c);
+            if (newQuery != null) {
+                // The suggestion rewrites the query.
+                // Update the text field, without getting new suggestions.
+                setQuery(newQuery);
+            } else {
+                // The suggestion does not rewrite the query, restore the user's query.
+                setQuery(oldQuery);
+            }
+        } else {
+            // We got a bad position, restore the user's query.
+            setQuery(oldQuery);
+        }
+    }
+
+    /**
+     * Launches an intent based on a suggestion.
+     *
+     * @param position The index of the suggestion to create the intent from.
+     * @param actionKey The key code of the action key that was pressed,
+     *        or {@link KeyEvent#KEYCODE_UNKNOWN} if none.
+     * @param actionMsg The message for the action key that was pressed,
+     *        or <code>null</code> if none.
+     * @return true if a successful launch, false if could not (e.g. bad position).
+     */
+    private boolean launchSuggestion(int position, int actionKey, String actionMsg) {
+        Cursor c = mSuggestionsAdapter.getCursor();
+        if ((c != null) && c.moveToPosition(position)) {
+
+            Intent intent = createIntentFromSuggestion(c, actionKey, actionMsg);
+
+            // launch the intent
+            launchIntent(intent);
+
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Launches an intent, including any special intent handling.
+     */
+    private void launchIntent(Intent intent) {
+        if (intent == null) {
+            return;
+        }
+        try {
+            // If the intent was created from a suggestion, it will always have an explicit
+            // component here.
+            getContext().startActivity(intent);
+        } catch (RuntimeException ex) {
+            Log.e(LOG_TAG, "Failed launch activity: " + intent, ex);
+        }
+    }
+
+    /**
+     * Sets the text in the query box, without updating the suggestions.
+     */
+    private void setQuery(CharSequence query) {
+        setText(mQueryTextView, query, true);
+        // Move the cursor to the end
+        mQueryTextView.setSelection(TextUtils.isEmpty(query) ? 0 : query.length());
+    }
+
+    private void launchQuerySearch(int actionKey, String actionMsg, String query) {
+        String action = Intent.ACTION_SEARCH;
+        Intent intent = createIntent(action, null, null, query, actionKey, actionMsg);
+        getContext().startActivity(intent);
+    }
+
+    /**
+     * Constructs an intent from the given information and the search dialog state.
+     *
+     * @param action Intent action.
+     * @param data Intent data, or <code>null</code>.
+     * @param extraData Data for {@link SearchManager#EXTRA_DATA_KEY} or <code>null</code>.
+     * @param query Intent query, or <code>null</code>.
+     * @param actionKey The key code of the action key that was pressed,
+     *        or {@link KeyEvent#KEYCODE_UNKNOWN} if none.
+     * @param actionMsg The message for the action key that was pressed,
+     *        or <code>null</code> if none.
+     * @return The intent.
+     */
+    private Intent createIntent(String action, Uri data, String extraData, String query,
+                                                            int actionKey, String actionMsg) {
+        // Now build the Intent
+        Intent intent = new Intent(action);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        // We need CLEAR_TOP to avoid reusing an old task that has other activities
+        // on top of the one we want. We don't want to do this in in-app search though,
+        // as it can be destructive to the activity stack.
+        if (data != null) {
+            intent.setData(data);
+        }
+        intent.putExtra(SearchManager.USER_QUERY, mUserQuery);
+        if (query != null) {
+            intent.putExtra(SearchManager.QUERY, query);
+        }
+        if (extraData != null) {
+            intent.putExtra(SearchManager.EXTRA_DATA_KEY, extraData);
+        }
+        if (mAppSearchData != null) {
+            intent.putExtra(SearchManager.APP_DATA, mAppSearchData);
+        }
+        if (actionKey != KeyEvent.KEYCODE_UNKNOWN) {
+            intent.putExtra(SearchManager.ACTION_KEY, actionKey);
+            intent.putExtra(SearchManager.ACTION_MSG, actionMsg);
+        }
+        intent.setComponent(mSearchable.getSearchActivity());
+        return intent;
+    }
+
+    /**
+     * Create and return an Intent that can launch the voice search activity for web search.
+     */
+    private Intent createVoiceWebSearchIntent(Intent baseIntent, SearchableInfo searchable) {
+        Intent voiceIntent = new Intent(baseIntent);
+        ComponentName searchActivity = searchable.getSearchActivity();
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, searchActivity == null ? null
+                : searchActivity.flattenToShortString());
+        return voiceIntent;
+    }
+
+    /**
+     * Create and return an Intent that can launch the voice search activity, perform a specific
+     * voice transcription, and forward the results to the searchable activity.
+     *
+     * @param baseIntent The voice app search intent to start from
+     * @return A completely-configured intent ready to send to the voice search activity
+     */
+    private Intent createVoiceAppSearchIntent(Intent baseIntent, SearchableInfo searchable) {
+        ComponentName searchActivity = searchable.getSearchActivity();
+
+        // create the necessary intent to set up a search-and-forward operation
+        // in the voice search system.   We have to keep the bundle separate,
+        // because it becomes immutable once it enters the PendingIntent
+        Intent queryIntent = new Intent(Intent.ACTION_SEARCH);
+        queryIntent.setComponent(searchActivity);
+        PendingIntent pending = PendingIntent.getActivity(getContext(), 0, queryIntent,
+                PendingIntent.FLAG_ONE_SHOT);
+
+        // Now set up the bundle that will be inserted into the pending intent
+        // when it's time to do the search.  We always build it here (even if empty)
+        // because the voice search activity will always need to insert "QUERY" into
+        // it anyway.
+        Bundle queryExtras = new Bundle();
+
+        // Now build the intent to launch the voice search.  Add all necessary
+        // extras to launch the voice recognizer, and then all the necessary extras
+        // to forward the results to the searchable activity
+        Intent voiceIntent = new Intent(baseIntent);
+
+        // Add all of the configuration options supplied by the searchable's metadata
+        String languageModel = RecognizerIntent.LANGUAGE_MODEL_FREE_FORM;
+        String prompt = null;
+        String language = null;
+        int maxResults = 1;
+
+        Resources resources = getResources();
+        if (searchable.getVoiceLanguageModeId() != 0) {
+            languageModel = resources.getString(searchable.getVoiceLanguageModeId());
+        }
+        if (searchable.getVoicePromptTextId() != 0) {
+            prompt = resources.getString(searchable.getVoicePromptTextId());
+        }
+        if (searchable.getVoiceLanguageId() != 0) {
+            language = resources.getString(searchable.getVoiceLanguageId());
+        }
+        if (searchable.getVoiceMaxResults() != 0) {
+            maxResults = searchable.getVoiceMaxResults();
+        }
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, languageModel);
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, prompt);
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, language);
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, maxResults);
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, searchActivity == null ? null
+                : searchActivity.flattenToShortString());
+
+        // Add the values that configure forwarding the results
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_RESULTS_PENDINGINTENT, pending);
+        voiceIntent.putExtra(RecognizerIntent.EXTRA_RESULTS_PENDINGINTENT_BUNDLE, queryExtras);
+
+        return voiceIntent;
+    }
+
+    /**
+     * When a particular suggestion has been selected, perform the various lookups required
+     * to use the suggestion.  This includes checking the cursor for suggestion-specific data,
+     * and/or falling back to the XML for defaults;  It also creates REST style Uri data when
+     * the suggestion includes a data id.
+     *
+     * @param c The suggestions cursor, moved to the row of the user's selection
+     * @param actionKey The key code of the action key that was pressed,
+     *        or {@link KeyEvent#KEYCODE_UNKNOWN} if none.
+     * @param actionMsg The message for the action key that was pressed,
+     *        or <code>null</code> if none.
+     * @return An intent for the suggestion at the cursor's position.
+     */
+    private Intent createIntentFromSuggestion(Cursor c, int actionKey, String actionMsg) {
+        try {
+            // use specific action if supplied, or default action if supplied, or fixed default
+            String action = getColumnString(c, SearchManager.SUGGEST_COLUMN_INTENT_ACTION);
+
+            if (action == null) {
+                action = mSearchable.getSuggestIntentAction();
+            }
+            if (action == null) {
+                action = Intent.ACTION_SEARCH;
+            }
+
+            // use specific data if supplied, or default data if supplied
+            String data = getColumnString(c, SearchManager.SUGGEST_COLUMN_INTENT_DATA);
+            if (data == null) {
+                data = mSearchable.getSuggestIntentData();
+            }
+            // then, if an ID was provided, append it.
+            if (data != null) {
+                String id = getColumnString(c, SearchManager.SUGGEST_COLUMN_INTENT_DATA_ID);
+                if (id != null) {
+                    data = data + "/" + Uri.encode(id);
+                }
+            }
+            Uri dataUri = (data == null) ? null : Uri.parse(data);
+
+            String query = getColumnString(c, SearchManager.SUGGEST_COLUMN_QUERY);
+            String extraData = getColumnString(c, SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA);
+
+            return createIntent(action, dataUri, extraData, query, actionKey, actionMsg);
+        } catch (RuntimeException e ) {
+            int rowNum;
+            try {                       // be really paranoid now
+                rowNum = c.getPosition();
+            } catch (RuntimeException e2 ) {
+                rowNum = -1;
+            }
+            Log.w(LOG_TAG, "Search suggestions cursor at row " + rowNum +
+                            " returned exception.", e);
+            return null;
+        }
+    }
+
+    private void forceSuggestionQuery() {
+        try {
+            Method before = AutoCompleteTextView.class.getDeclaredMethod("doBeforeTextChanged");
+            Method after = AutoCompleteTextView.class.getDeclaredMethod("doAfterTextChanged");
+            before.setAccessible(true);
+            after.setAccessible(true);
+            before.invoke(mQueryTextView);
+            after.invoke(mQueryTextView);
+        } catch (Exception e) {
+            // Oh well...
+        }
+    }
+
+    static boolean isLandscapeMode(Context context) {
+        return context.getResources().getConfiguration().orientation
+                == Configuration.ORIENTATION_LANDSCAPE;
+    }
+
+    /**
+     * Callback to watch the text field for empty/non-empty
+     */
+    private TextWatcher mTextWatcher = new TextWatcher() {
+
+        public void beforeTextChanged(CharSequence s, int start, int before, int after) { }
+
+        public void onTextChanged(CharSequence s, int start,
+                                                            int before, int after) {
+            SearchView.this.onTextChanged(s);
+        }
+
+        public void afterTextChanged(Editable s) {
+        }
+    };
+
+    /**
+     * Local subclass for AutoCompleteTextView.
+     * @hide
+     */
+    public static class SearchAutoComplete extends AutoCompleteTextView {
+
+        private int mThreshold;
+        private SearchView mSearchView;
+
+        public SearchAutoComplete(Context context) {
+            super(context);
+            mThreshold = getThreshold();
+        }
+
+        public SearchAutoComplete(Context context, AttributeSet attrs) {
+            super(context, attrs);
+            mThreshold = getThreshold();
+        }
+
+        public SearchAutoComplete(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
+            mThreshold = getThreshold();
+        }
+
+        void setSearchView(SearchView searchView) {
+            mSearchView = searchView;
+        }
+
+        @Override
+        public void setThreshold(int threshold) {
+            super.setThreshold(threshold);
+            mThreshold = threshold;
+        }
+
+        /**
+         * Returns true if the text field is empty, or contains only whitespace.
+         */
+        private boolean isEmpty() {
+            return TextUtils.getTrimmedLength(getText()) == 0;
+        }
+
+        /**
+         * We override this method to avoid replacing the query box text when a
+         * suggestion is clicked.
+         */
+        @Override
+        protected void replaceText(CharSequence text) {
+        }
+
+        /**
+         * We override this method to avoid an extra onItemClick being called on
+         * the drop-down's OnItemClickListener by
+         * {@link AutoCompleteTextView#onKeyUp(int, KeyEvent)} when an item is
+         * clicked with the trackball.
+         */
+        @Override
+        public void performCompletion() {
+        }
+
+        /**
+         * We override this method to be sure and show the soft keyboard if
+         * appropriate when the TextView has focus.
+         */
+        @Override
+        public void onWindowFocusChanged(boolean hasWindowFocus) {
+            super.onWindowFocusChanged(hasWindowFocus);
+
+            if (hasWindowFocus && mSearchView.hasFocus() && getVisibility() == VISIBLE) {
+                InputMethodManager inputManager = (InputMethodManager) getContext()
+                        .getSystemService(Context.INPUT_METHOD_SERVICE);
+                inputManager.showSoftInput(this, 0);
+                // If in landscape mode, then make sure that
+                // the ime is in front of the dropdown.
+                if (isLandscapeMode(getContext())) {
+                    ensureImeVisible(this, true);
+                }
+            }
+        }
+
+        @Override
+        protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) {
+            super.onFocusChanged(focused, direction, previouslyFocusedRect);
+            mSearchView.onTextFocusChanged();
+        }
+
+        /**
+         * We override this method so that we can allow a threshold of zero,
+         * which ACTV does not.
+         */
+        @Override
+        public boolean enoughToFilter() {
+            return mThreshold <= 0 || super.enoughToFilter();
+        }
+
+        @Override
+        public boolean onKeyPreIme(int keyCode, KeyEvent event) {
+            if (keyCode == KeyEvent.KEYCODE_BACK) {
+                // special case for the back key, we do not even try to send it
+                // to the drop down list but instead, consume it immediately
+                if (event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() == 0) {
+                    KeyEvent.DispatcherState state = getKeyDispatcherState();
+                    if (state != null) {
+                        state.startTracking(event, this);
+                    }
+                    return true;
+                } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                    KeyEvent.DispatcherState state = getKeyDispatcherState();
+                    if (state != null) {
+                        state.handleUpEvent(event);
+                    }
+                    if (event.isTracking() && !event.isCanceled()) {
+                        mSearchView.clearFocus();
+                        mSearchView.setImeVisibility(false);
+                        return true;
+                    }
+                }
+            }
+            return super.onKeyPreIme(keyCode, event);
+        }
+
+    }
+
+    private static void ensureImeVisible(AutoCompleteTextView view, boolean visible) {
+        try {
+            Method method = AutoCompleteTextView.class.getMethod("ensureImeVisible", boolean.class);
+            method.setAccessible(true);
+            method.invoke(view, visible);
+        } catch (Exception e) {
+            //Oh well...
+        }
+    }
+
+    private static void showSoftInputUnchecked(View view, InputMethodManager imm, int flags) {
+        try {
+            Method method = imm.getClass().getMethod("showSoftInputUnchecked", int.class, ResultReceiver.class);
+            method.setAccessible(true);
+            method.invoke(imm, flags, null);
+        } catch (Exception e) {
+            //Fallback to public API which hopefully does mostly the same thing
+            imm.showSoftInput(view, flags);
+        }
+    }
+
+    private static void setText(AutoCompleteTextView view, CharSequence text, boolean filter) {
+        try {
+            Method method = AutoCompleteTextView.class.getMethod("setText", CharSequence.class, boolean.class);
+            method.setAccessible(true);
+            method.invoke(view, text, filter);
+        } catch (Exception e) {
+            //Fallback to public API which hopefully does mostly the same thing
+            view.setText(text);
+        }
+    }
+}
diff --git a/library/src/com/actionbarsherlock/widget/ShareActionProvider.java b/actionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
index 83e9f0c..83e9f0c 100644..100755
--- a/library/src/com/actionbarsherlock/widget/ShareActionProvider.java
+++ b/actionbarsherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java
diff --git a/actionbarsherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/actionbarsherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
new file mode 100755
index 0000000..82d4f0c
--- /dev/null
+++ b/actionbarsherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java
@@ -0,0 +1,758 @@
+/*
+ * Copyright (C) 2009 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.
+ */
+
+package com.actionbarsherlock.widget;
+
+import android.app.SearchManager;
+import android.app.SearchableInfo;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.widget.ResourceCursorAdapter;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+import com.actionbarsherlock.R;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.WeakHashMap;
+
+/**
+ * Provides the contents for the suggestion drop-down list.
+ *
+ * @hide
+ */
+class SuggestionsAdapter extends ResourceCursorAdapter implements OnClickListener {
+
+    private static final boolean DBG = false;
+    private static final String LOG_TAG = "SuggestionsAdapter";
+    private static final int QUERY_LIMIT = 50;
+
+    static final int REFINE_NONE = 0;
+    static final int REFINE_BY_ENTRY = 1;
+    static final int REFINE_ALL = 2;
+
+    private SearchManager mSearchManager;
+    private SearchableInfo mSearchable;
+    private SearchView mSearchView;
+    private Context mProviderContext;
+    private WeakHashMap<String, Drawable.ConstantState> mOutsideDrawablesCache;
+    private boolean mClosed = false;
+    private int mQueryRefinement = REFINE_BY_ENTRY;
+
+    // URL color
+    private ColorStateList mUrlColor;
+
+    static final int INVALID_INDEX = -1;
+
+    // Cached column indexes, updated when the cursor changes.
+    private int mText1Col = INVALID_INDEX;
+    private int mText2Col = INVALID_INDEX;
+    private int mText2UrlCol = INVALID_INDEX;
+    private int mIconName1Col = INVALID_INDEX;
+    private int mIconName2Col = INVALID_INDEX;
+    private int mFlagsCol = INVALID_INDEX;
+
+    // private final Runnable mStartSpinnerRunnable;
+    // private final Runnable mStopSpinnerRunnable;
+
+    /**
+     * The amount of time we delay in the filter when the user presses the delete key.
+     */
+    //private static final long DELETE_KEY_POST_DELAY = 500L;
+
+    public SuggestionsAdapter(Context context, SearchView searchView,
+                              SearchableInfo searchable, WeakHashMap<String, Drawable.ConstantState> outsideDrawablesCache) {
+        super(context,
+            R.layout.abs__search_dropdown_item_icons_2line,
+            null,   // no initial cursor
+            true);  // auto-requery
+        mSearchManager = (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE);
+        mSearchable = searchable;
+        mProviderContext = mContext;
+        mSearchView = searchView;
+
+        mOutsideDrawablesCache = outsideDrawablesCache;
+
+        // mStartSpinnerRunnable = new Runnable() {
+        // public void run() {
+        // // mSearchView.setWorking(true); // TODO:
+        // }
+        // };
+        //
+        // mStopSpinnerRunnable = new Runnable() {
+        // public void run() {
+        // // mSearchView.setWorking(false); // TODO:
+        // }
+        // };
+
+        // delay 500ms when deleting
+//  TODO  getFilter().setDelayer(new Filter.Delayer() {
+//
+//      private int mPreviousLength = 0;
+//
+//      public long getPostingDelay(CharSequence constraint) {
+//        if (constraint == null) return 0;
+//
+//        long delay = constraint.length() < mPreviousLength ? DELETE_KEY_POST_DELAY : 0;
+//        mPreviousLength = constraint.length();
+//        return delay;
+//      }
+//    });
+    }
+
+    /**
+     * Enables query refinement for all suggestions. This means that an additional icon
+     * will be shown for each entry. When clicked, the suggested text on that line will be
+     * copied to the query text field.
+     * <p>
+     *
+     * @param refineWhat which queries to refine. Possible values are {@link #REFINE_NONE},
+     * {@link #REFINE_BY_ENTRY}, and {@link #REFINE_ALL}.
+     */
+    public void setQueryRefinement(int refineWhat) {
+        mQueryRefinement = refineWhat;
+    }
+
+    /**
+     * Returns the current query refinement preference.
+     * @return value of query refinement preference
+     */
+    public int getQueryRefinement() {
+        return mQueryRefinement;
+    }
+
+    /**
+     * Overridden to always return <code>false</code>, since we cannot be sure that
+     * suggestion sources return stable IDs.
+     */
+    @Override
+    public boolean hasStableIds() {
+        return false;
+    }
+
+    /**
+     * Use the search suggestions provider to obtain a live cursor.  This will be called
+     * in a worker thread, so it's OK if the query is slow (e.g. round trip for suggestions).
+     * The results will be processed in the UI thread and changeCursor() will be called.
+     */
+    @Override
+    public Cursor runQueryOnBackgroundThread(CharSequence constraint) {
+        if (DBG) Log.d(LOG_TAG, "runQueryOnBackgroundThread(" + constraint + ")");
+        String query = (constraint == null) ? "" : constraint.toString();
+        /**
+         * for in app search we show the progress spinner until the cursor is returned with
+         * the results.
+         */
+        Cursor cursor = null;
+        if (mSearchView.getVisibility() != View.VISIBLE
+                || mSearchView.getWindowVisibility() != View.VISIBLE) {
+            return null;
+        }
+        //mSearchView.getWindow().getDecorView().post(mStartSpinnerRunnable); // TODO:
+        try {
+            cursor = getSuggestions(query, QUERY_LIMIT);
+            // trigger fill window so the spinner stays up until the results are copied over and
+            // closer to being ready
+            if (cursor != null) {
+                cursor.getCount();
+                return cursor;
+            }
+        } catch (RuntimeException e) {
+            Log.w(LOG_TAG, "Search suggestions query threw an exception.", e);
+        }
+        // If cursor is null or an exception was thrown, stop the spinner and return null.
+        // changeCursor doesn't get called if cursor is null
+        // mSearchView.getWindow().getDecorView().post(mStopSpinnerRunnable); // TODO:
+        return null;
+    }
+
+    public Cursor getSuggestions(String query, int limit) {
+        if (mSearchable == null) {
+            return null;
+        }
+
+        String authority = mSearchable.getSuggestAuthority();
+        if (authority == null) {
+            return null;
+        }
+
+        Uri.Builder uriBuilder = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(authority)
+                .query("")  // TODO: Remove, workaround for a bug in Uri.writeToParcel()
+                .fragment("");  // TODO: Remove, workaround for a bug in Uri.writeToParcel()
+
+        // if content path provided, insert it now
+        final String contentPath = mSearchable.getSuggestPath();
+        if (contentPath != null) {
+            uriBuilder.appendEncodedPath(contentPath);
+        }
+
+        // append standard suggestion query path
+        uriBuilder.appendPath(SearchManager.SUGGEST_URI_PATH_QUERY);
+
+        // get the query selection, may be null
+        String selection = mSearchable.getSuggestSelection();
+        // inject query, either as selection args or inline
+        String[] selArgs = null;
+        if (selection != null) {    // use selection if provided
+            selArgs = new String[] { query };
+        } else {                    // no selection, use REST pattern
+            uriBuilder.appendPath(query);
+        }
+
+        if (limit > 0) {
+            uriBuilder.appendQueryParameter("limit", String.valueOf(limit));
+        }
+
+        Uri uri = uriBuilder.build();
+
+        // finally, make the query
+        return mContext.getContentResolver().query(uri, null, selection, selArgs, null);
+    }
+
+    public void close() {
+        if (DBG) Log.d(LOG_TAG, "close()");
+        changeCursor(null);
+        mClosed = true;
+    }
+
+    @Override
+    public void notifyDataSetChanged() {
+        if (DBG) Log.d(LOG_TAG, "notifyDataSetChanged");
+        super.notifyDataSetChanged();
+
+        // mSearchView.onDataSetChanged(); // TODO:
+
+        updateSpinnerState(getCursor());
+    }
+
+    @Override
+    public void notifyDataSetInvalidated() {
+        if (DBG) Log.d(LOG_TAG, "notifyDataSetInvalidated");
+        super.notifyDataSetInvalidated();
+
+        updateSpinnerState(getCursor());
+    }
+
+    private void updateSpinnerState(Cursor cursor) {
+        Bundle extras = cursor != null ? cursor.getExtras() : null;
+        if (DBG) {
+            Log.d(LOG_TAG, "updateSpinnerState - extra = "
+                    + (extras != null
+                    ? extras.getBoolean(SearchManager.CURSOR_EXTRA_KEY_IN_PROGRESS)
+                    : null));
+        }
+        // Check if the Cursor indicates that the query is not complete and show the spinner
+        if (extras != null
+                && extras.getBoolean(SearchManager.CURSOR_EXTRA_KEY_IN_PROGRESS)) {
+            // mSearchView.getWindow().getDecorView().post(mStartSpinnerRunnable); // TODO:
+            return;
+        }
+        // If cursor is null or is done, stop the spinner
+        // mSearchView.getWindow().getDecorView().post(mStopSpinnerRunnable); // TODO:
+    }
+
+    /**
+     * Cache columns.
+     */
+    @Override
+    public void changeCursor(Cursor c) {
+        if (DBG) Log.d(LOG_TAG, "changeCursor(" + c + ")");
+
+        if (mClosed) {
+            Log.w(LOG_TAG, "Tried to change cursor after adapter was closed.");
+            if (c != null) c.close();
+            return;
+        }
+
+        try {
+            super.changeCursor(c);
+
+            if (c != null) {
+                mText1Col = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_TEXT_1);
+                mText2Col = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_TEXT_2);
+                mText2UrlCol = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_TEXT_2_URL);
+                mIconName1Col = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1);
+                mIconName2Col = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_2);
+                mFlagsCol = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_FLAGS);
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "error changing cursor and caching columns", e);
+        }
+    }
+
+    /**
+     * Tags the view with cached child view look-ups.
+     */
+    @Override
+    public View newView(Context context, Cursor cursor, ViewGroup parent) {
+        View v = super.newView(context, cursor, parent);
+        v.setTag(new ChildViewCache(v));
+        return v;
+    }
+
+    /**
+     * Cache of the child views of drop-drown list items, to avoid looking up the children
+     * each time the contents of a list item are changed.
+     */
+    private final static class ChildViewCache {
+        public final TextView mText1;
+        public final TextView mText2;
+        public final ImageView mIcon1;
+        public final ImageView mIcon2;
+        public final ImageView mIconRefine;
+
+        public ChildViewCache(View v) {
+            mText1 = (TextView) v.findViewById(android.R.id.text1);
+            mText2 = (TextView) v.findViewById(android.R.id.text2);
+            mIcon1 = (ImageView) v.findViewById(android.R.id.icon1);
+            mIcon2 = (ImageView) v.findViewById(android.R.id.icon2);
+            mIconRefine = (ImageView) v.findViewById(R.id.edit_query);
+        }
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+        ChildViewCache views = (ChildViewCache) view.getTag();
+
+        int flags = 0;
+        if (mFlagsCol != INVALID_INDEX) {
+            flags = cursor.getInt(mFlagsCol);
+        }
+        if (views.mText1 != null) {
+            String text1 = getStringOrNull(cursor, mText1Col);
+            setViewText(views.mText1, text1);
+        }
+        if (views.mText2 != null) {
+            // First check TEXT_2_URL
+            CharSequence text2 = getStringOrNull(cursor, mText2UrlCol);
+            if (text2 != null) {
+                text2 = formatUrl(text2);
+            } else {
+                text2 = getStringOrNull(cursor, mText2Col);
+            }
+
+            // If no second line of text is indicated, allow the first line of text
+            // to be up to two lines if it wants to be.
+            if (TextUtils.isEmpty(text2)) {
+                if (views.mText1 != null) {
+                    views.mText1.setSingleLine(false);
+                    views.mText1.setMaxLines(2);
+                }
+            } else {
+                if (views.mText1 != null) {
+                    views.mText1.setSingleLine(true);
+                    views.mText1.setMaxLines(1);
+                }
+            }
+            setViewText(views.mText2, text2);
+        }
+
+        if (views.mIcon1 != null) {
+            setViewDrawable(views.mIcon1, getIcon1(cursor), View.INVISIBLE);
+        }
+        if (views.mIcon2 != null) {
+            setViewDrawable(views.mIcon2, getIcon2(cursor), View.GONE);
+        }
+        if (mQueryRefinement == REFINE_ALL
+                || (mQueryRefinement == REFINE_BY_ENTRY
+                && (flags & SearchManager.FLAG_QUERY_REFINEMENT) != 0)) {
+            views.mIconRefine.setVisibility(View.VISIBLE);
+            views.mIconRefine.setTag(views.mText1.getText());
+            views.mIconRefine.setOnClickListener(this);
+        } else {
+            views.mIconRefine.setVisibility(View.GONE);
+        }
+    }
+
+    public void onClick(View v) {
+        Object tag = v.getTag();
+        if (tag instanceof CharSequence) {
+            mSearchView.onQueryRefine((CharSequence) tag);
+        }
+    }
+
+    private CharSequence formatUrl(CharSequence url) {
+        if (mUrlColor == null) {
+            // Lazily get the URL color from the current theme.
+            TypedValue colorValue = new TypedValue();
+            mContext.getTheme().resolveAttribute(R.attr.textColorSearchUrl, colorValue, true);
+            mUrlColor = mContext.getResources().getColorStateList(colorValue.resourceId);
+        }
+
+        SpannableString text = new SpannableString(url);
+        text.setSpan(new TextAppearanceSpan(null, 0, 0, mUrlColor, null),
+                0, url.length(),
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return text;
+    }
+
+    private void setViewText(TextView v, CharSequence text) {
+        // Set the text even if it's null, since we need to clear any previous text.
+        v.setText(text);
+
+        if (TextUtils.isEmpty(text)) {
+            v.setVisibility(View.GONE);
+        } else {
+            v.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private Drawable getIcon1(Cursor cursor) {
+        if (mIconName1Col == INVALID_INDEX) {
+            return null;
+        }
+        String value = cursor.getString(mIconName1Col);
+        Drawable drawable = getDrawableFromResourceValue(value);
+        if (drawable != null) {
+            return drawable;
+        }
+        return getDefaultIcon1(cursor);
+    }
+
+    private Drawable getIcon2(Cursor cursor) {
+        if (mIconName2Col == INVALID_INDEX) {
+            return null;
+        }
+        String value = cursor.getString(mIconName2Col);
+        return getDrawableFromResourceValue(value);
+    }
+
+    /**
+     * Sets the drawable in an image view, makes sure the view is only visible if there
+     * is a drawable.
+     */
+    private void setViewDrawable(ImageView v, Drawable drawable, int nullVisibility) {
+        // Set the icon even if the drawable is null, since we need to clear any
+        // previous icon.
+        v.setImageDrawable(drawable);
+
+        if (drawable == null) {
+            v.setVisibility(nullVisibility);
+        } else {
+            v.setVisibility(View.VISIBLE);
+
+            // This is a hack to get any animated drawables (like a 'working' spinner)
+            // to animate. You have to setVisible true on an AnimationDrawable to get
+            // it to start animating, but it must first have been false or else the
+            // call to setVisible will be ineffective. We need to clear up the story
+            // about animated drawables in the future, see http://b/1878430.
+            drawable.setVisible(false, false);
+            drawable.setVisible(true, false);
+        }
+    }
+
+    /**
+     * Gets the text to show in the query field when a suggestion is selected.
+     *
+     * @param cursor The Cursor to read the suggestion data from. The Cursor should already
+     *        be moved to the suggestion that is to be read from.
+     * @return The text to show, or <code>null</code> if the query should not be
+     *         changed when selecting this suggestion.
+     */
+    @Override
+    public CharSequence convertToString(Cursor cursor) {
+        if (cursor == null) {
+            return null;
+        }
+
+        String query = getColumnString(cursor, SearchManager.SUGGEST_COLUMN_QUERY);
+        if (query != null) {
+            return query;
+        }
+
+        return null;
+    }
+
+    /**
+     * This method is overridden purely to provide a bit of protection against
+     * flaky content providers.
+     *
+     * @see android.widget.ListAdapter#getView(int, View, ViewGroup)
+     */
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        try {
+            return super.getView(position, convertView, parent);
+        } catch (RuntimeException e) {
+            Log.w(LOG_TAG, "Search suggestions cursor threw exception.", e);
+            // Put exception string in item title
+            View v = newView(mContext, mCursor, parent);
+            if (v != null) {
+                ChildViewCache views = (ChildViewCache) v.getTag();
+                TextView tv = views.mText1;
+                tv.setText(e.toString());
+            }
+            return v;
+        }
+    }
+
+    /**
+     * Gets a drawable given a value provided by a suggestion provider.
+     *
+     * This value could be just the string value of a resource id
+     * (e.g., "2130837524"), in which case we will try to retrieve a drawable from
+     * the provider's resources. If the value is not an integer, it is
+     * treated as a Uri and opened with
+     * {@link ContentResolver#openOutputStream(android.net.Uri, String)}.
+     *
+     * All resources and URIs are read using the suggestion provider's context.
+     *
+     * If the string is not formatted as expected, or no drawable can be found for
+     * the provided value, this method returns null.
+     *
+     * @param drawableId a string like "2130837524",
+     *        "android.resource://com.android.alarmclock/2130837524",
+     *        or "content://contacts/photos/253".
+     * @return a Drawable, or null if none found
+     */
+    private Drawable getDrawableFromResourceValue(String drawableId) {
+        if (drawableId == null || drawableId.length() == 0 || "0".equals(drawableId)) {
+            return null;
+        }
+        try {
+            // First, see if it's just an integer
+            int resourceId = Integer.parseInt(drawableId);
+            // It's an int, look for it in the cache
+            String drawableUri = ContentResolver.SCHEME_ANDROID_RESOURCE
+                    + "://" + mProviderContext.getPackageName() + "/" + resourceId;
+            // Must use URI as cache key, since ints are app-specific
+            Drawable drawable = checkIconCache(drawableUri);
+            if (drawable != null) {
+                return drawable;
+            }
+            // Not cached, find it by resource ID
+            drawable = mProviderContext.getResources().getDrawable(resourceId);
+            // Stick it in the cache, using the URI as key
+            storeInIconCache(drawableUri, drawable);
+            return drawable;
+        } catch (NumberFormatException nfe) {
+            // It's not an integer, use it as a URI
+            Drawable drawable = checkIconCache(drawableId);
+            if (drawable != null) {
+                return drawable;
+            }
+            Uri uri = Uri.parse(drawableId);
+            drawable = getDrawable(uri);
+            storeInIconCache(drawableId, drawable);
+            return drawable;
+        } catch (Resources.NotFoundException nfe) {
+            // It was an integer, but it couldn't be found, bail out
+            Log.w(LOG_TAG, "Icon resource not found: " + drawableId);
+            return null;
+        }
+    }
+
+    /**
+     * Gets a drawable by URI, without using the cache.
+     *
+     * @return A drawable, or {@code null} if the drawable could not be loaded.
+     */
+    private Drawable getDrawable(Uri uri) {
+        try {
+            String scheme = uri.getScheme();
+            if (ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)) {
+                // Load drawables through Resources, to get the source density information
+                try {
+                    return getTheDrawable(uri);
+                } catch (Resources.NotFoundException ex) {
+                    throw new FileNotFoundException("Resource does not exist: " + uri);
+                }
+            } else {
+                // Let the ContentResolver handle content and file URIs.
+                InputStream stream = mProviderContext.getContentResolver().openInputStream(uri);
+                if (stream == null) {
+                    throw new FileNotFoundException("Failed to open " + uri);
+                }
+                try {
+                    return Drawable.createFromStream(stream, null);
+                } finally {
+                    try {
+                        stream.close();
+                    } catch (IOException ex) {
+                        Log.e(LOG_TAG, "Error closing icon stream for " + uri, ex);
+                    }
+                }
+            }
+        } catch (FileNotFoundException fnfe) {
+            Log.w(LOG_TAG, "Icon not found: " + uri + ", " + fnfe.getMessage());
+            return null;
+        }
+    }
+
+    public Drawable getTheDrawable(Uri uri) throws FileNotFoundException {
+        String authority = uri.getAuthority();
+        Resources r;
+        if (TextUtils.isEmpty(authority)) {
+            throw new FileNotFoundException("No authority: " + uri);
+        } else {
+            try {
+                r = mContext.getPackageManager().getResourcesForApplication(authority);
+            } catch (NameNotFoundException ex) {
+                throw new FileNotFoundException("No package found for authority: " + uri);
+            }
+        }
+        List<String> path = uri.getPathSegments();
+        if (path == null) {
+            throw new FileNotFoundException("No path: " + uri);
+        }
+        int len = path.size();
+        int id;
+        if (len == 1) {
+            try {
+                id = Integer.parseInt(path.get(0));
+            } catch (NumberFormatException e) {
+                throw new FileNotFoundException("Single path segment is not a resource ID: " + uri);
+            }
+        } else if (len == 2) {
+            id = r.getIdentifier(path.get(1), path.get(0), authority);
+        } else {
+            throw new FileNotFoundException("More than two path segments: " + uri);
+        }
+        if (id == 0) {
+            throw new FileNotFoundException("No resource found for: " + uri);
+        }
+        return r.getDrawable(id);
+    }
+
+    private Drawable checkIconCache(String resourceUri) {
+        Drawable.ConstantState cached = mOutsideDrawablesCache.get(resourceUri);
+        if (cached == null) {
+            return null;
+        }
+        if (DBG) Log.d(LOG_TAG, "Found icon in cache: " + resourceUri);
+        return cached.newDrawable();
+    }
+
+    private void storeInIconCache(String resourceUri, Drawable drawable) {
+        if (drawable != null) {
+            mOutsideDrawablesCache.put(resourceUri, drawable.getConstantState());
+        }
+    }
+
+    /**
+     * Gets the left-hand side icon that will be used for the current suggestion
+     * if the suggestion contains an icon column but no icon or a broken icon.
+     *
+     * @param cursor A cursor positioned at the current suggestion.
+     * @return A non-null drawable.
+     */
+    private Drawable getDefaultIcon1(Cursor cursor) {
+        // Fall back to a default icon
+        return mContext.getPackageManager().getDefaultActivityIcon();
+    }
+
+    /**
+     * Gets the activity or application icon for an activity.
+     * Uses the local icon cache for fast repeated lookups.
+     *
+     * @param component Name of an activity.
+     * @return A drawable, or {@code null} if neither the activity nor the application
+     *         has an icon set.
+     */
+    private Drawable getActivityIconWithCache(ComponentName component) {
+        // First check the icon cache
+        String componentIconKey = component.flattenToShortString();
+        // Using containsKey() since we also store null values.
+        if (mOutsideDrawablesCache.containsKey(componentIconKey)) {
+            Drawable.ConstantState cached = mOutsideDrawablesCache.get(componentIconKey);
+            return cached == null ? null : cached.newDrawable(mProviderContext.getResources());
+        }
+        // Then try the activity or application icon
+        Drawable drawable = getActivityIcon(component);
+        // Stick it in the cache so we don't do this lookup again.
+        Drawable.ConstantState toCache = drawable == null ? null : drawable.getConstantState();
+        mOutsideDrawablesCache.put(componentIconKey, toCache);
+        return drawable;
+    }
+
+    /**
+     * Gets the activity or application icon for an activity.
+     *
+     * @param component Name of an activity.
+     * @return A drawable, or {@code null} if neither the acitivy or the application
+     *         have an icon set.
+     */
+    private Drawable getActivityIcon(ComponentName component) {
+        PackageManager pm = mContext.getPackageManager();
+        final ActivityInfo activityInfo;
+        try {
+            activityInfo = pm.getActivityInfo(component, PackageManager.GET_META_DATA);
+        } catch (NameNotFoundException ex) {
+            Log.w(LOG_TAG, ex.toString());
+            return null;
+        }
+        int iconId = activityInfo.getIconResource();
+        if (iconId == 0) return null;
+        String pkg = component.getPackageName();
+        Drawable drawable = pm.getDrawable(pkg, iconId, activityInfo.applicationInfo);
+        if (drawable == null) {
+            Log.w(LOG_TAG, "Invalid icon resource " + iconId + " for "
+                    + component.flattenToShortString());
+            return null;
+        }
+        return drawable;
+    }
+
+    /**
+     * Gets the value of a string column by name.
+     *
+     * @param cursor Cursor to read the value from.
+     * @param columnName The name of the column to read.
+     * @return The value of the given column, or <code>null</null>
+     *         if the cursor does not contain the given column.
+     */
+    public static String getColumnString(Cursor cursor, String columnName) {
+        int col = cursor.getColumnIndex(columnName);
+        return getStringOrNull(cursor, col);
+    }
+
+    private static String getStringOrNull(Cursor cursor, int col) {
+        if (col == INVALID_INDEX) {
+            return null;
+        }
+        try {
+            return cursor.getString(col);
+        } catch (Exception e) {
+            Log.e(LOG_TAG,
+                    "unexpected error retrieving valid column from cursor, "
+                            + "did the remote process die?", e);
+            return null;
+        }
+    }
+}
diff --git a/actionbarsherlock/test/com/actionbarsherlock/internal/ResourcesCompatTest.java b/actionbarsherlock/test/com/actionbarsherlock/internal/ResourcesCompatTest.java
new file mode 100755
index 0000000..f621d3a
--- /dev/null
+++ b/actionbarsherlock/test/com/actionbarsherlock/internal/ResourcesCompatTest.java
@@ -0,0 +1,23 @@
+package com.actionbarsherlock.internal;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import static com.actionbarsherlock.internal.ActionBarSherlockCompat.cleanActivityName;
+import static org.fest.assertions.api.Assertions.assertThat;
+
+@RunWith(RobolectricTestRunner.class)
+public class ResourcesCompatTest {
+    @Test
+    public void testCleanActivityName() {
+        assertThat(cleanActivityName("com.jakewharton.test", "com.other.package.SomeClass")) //
+            .isEqualTo("com.other.package.SomeClass");
+        assertThat(cleanActivityName("com.jakewharton.test", "com.jakewharton.test.SomeClass")) //
+            .isEqualTo("com.jakewharton.test.SomeClass");
+        assertThat(cleanActivityName("com.jakewharton.test", "SomeClass")) //
+            .isEqualTo("com.jakewharton.test.SomeClass");
+        assertThat(cleanActivityName("com.jakewharton.test", ".ui.SomeClass")) //
+            .isEqualTo("com.jakewharton.test.ui.SomeClass");
+    }
+}
\ No newline at end of file
diff --git a/checkstyle.xml b/checkstyle.xml
index cfde0ea..e048431 100644..100755
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -84,7 +84,6 @@
         <!-- Checks for common coding problems               -->

         <!-- See http://checkstyle.sf.net/config_coding.html -->

         <!--module name="AvoidInlineConditionals"/-->

-        <module name="DoubleCheckedLocking"/>

         <!--module name="EmptyStatement"/-->

         <!--module name="EqualsHashCode"/-->

         <!--module name="HiddenField"/-->

diff --git a/deploy_website.sh b/deploy_website.sh
new file mode 100755
index 0000000..f972633
--- /dev/null
+++ b/deploy_website.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+set -ex
+
+DIR=temp-clone
+
+# Delete any existing temporary website clone
+rm -rf $DIR
+
+# Clone the current repo into temp folder
+git clone git@github.com:JakeWharton/ActionBarSherlock.git $DIR
+
+# Move working directory into temp folder
+cd $DIR
+
+# Checkout and track the gh-pages branch
+git checkout -t origin/gh-pages
+
+# Delete everything
+rm -rf *
+
+# Copy website files from real repo
+cp -R ../website/* .
+
+# Stage all files in git and create a commit
+git add .
+git add -u
+git commit -m "Website at $(date)"
+
+# Push the new files up to GitHub
+git push origin gh-pages
+
+# Delete our temp folder
+cd ..
+rm -rf $DIR
diff --git a/library/pom.xml b/library/pom.xml
deleted file mode 100644
index 5373fb0..0000000
--- a/library/pom.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>library</artifactId>
-	<name>ActionBarSherlock</name>
-	<packaging>apklib</packaging>
-
-	<parent>
-		<groupId>com.actionbarsherlock</groupId>
-		<artifactId>parent</artifactId>
-		<version>4.1.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>support-v4</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>com.pivotallabs</groupId>
-			<artifactId>robolectric</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<testSourceDirectory>test</testSourceDirectory>
-
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<extensions>true</extensions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<artifactId>maven-replacer-plugin</artifactId>
-				<version>1.4.0</version>
-				<executions>
-					<execution>
-						<phase>process-sources</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<ignoreMissingFile>false</ignoreMissingFile>
-					<file>target/generated-sources/r/com/actionbarsherlock/R.java</file>
-					<outputFile>target/generated-sources/r/com/actionbarsherlock/R.java</outputFile>
-					<regex>false</regex>
-					<token>static final int</token>
-					<value>static int</value>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<configLocation>../checkstyle.xml</configLocation>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>checkstyle</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<type>jar</type>
-									<file>${project.build.directory}/${project.build.finalName}.jar</file>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-
-		<pluginManagement>
-			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-				<plugin>
-					<groupId>org.eclipse.m2e</groupId>
-					<artifactId>lifecycle-mapping</artifactId>
-					<version>1.0.0</version>
-					<configuration>
-						<lifecycleMappingMetadata>
-							<pluginExecutions>
-								<pluginExecution>
-									<pluginExecutionFilter>
-										<groupId>com.google.code.maven-replacer-plugin</groupId>
-										<artifactId>maven-replacer-plugin</artifactId>
-										<versionRange>[1.4.1,)</versionRange>
-										<goals>
-											<goal>replace</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-							</pluginExecutions>
-						</lifecycleMappingMetadata>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
deleted file mode 100644
index 79e56f5..0000000
--- a/library/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
+++ /dev/null
diff --git a/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
deleted file mode 100644
index e029f21..0000000
--- a/library/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
+++ /dev/null
diff --git a/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
deleted file mode 100644
index 8f10bd5..0000000
--- a/library/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png
+++ /dev/null
diff --git a/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
deleted file mode 100644
index fb3660e..0000000
--- a/library/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
+++ /dev/null
diff --git a/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
deleted file mode 100644
index f18050e..0000000
--- a/library/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
+++ /dev/null
diff --git a/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
deleted file mode 100644
index f4970ad..0000000
--- a/library/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
+++ /dev/null
diff --git a/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
deleted file mode 100644
index 172fc3b..0000000
--- a/library/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
+++ /dev/null
diff --git a/library/res/layout/abs__dialog_title_holo.xml b/library/res/layout/abs__dialog_title_holo.xml
deleted file mode 100644
index 6402f28..0000000
--- a/library/res/layout/abs__dialog_title_holo.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
-
-This is an optimized layout for a screen, with the minimum set of features
-enabled.
--->
-
-<com.actionbarsherlock.internal.widget.FakeDialogPhoneWindow xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true">
-    <TextView android:id="@android:id/title" style="?android:attr/windowTitleStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/abs__alert_dialog_title_height"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        android:gravity="center_vertical|left" />
-    <View android:id="@+id/abs__titleDivider"
-            android:layout_width="fill_parent"
-            android:layout_height="2dip"
-            android:background="@color/abs__holo_blue_light" />
-    <FrameLayout
-        android:layout_width="wrap_content" android:layout_height="0dp"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:foreground="?attr/windowContentOverlay">
-        <FrameLayout android:id="@+id/abs__content"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-    </FrameLayout>
-</com.actionbarsherlock.internal.widget.FakeDialogPhoneWindow>
diff --git a/library/res/layout/abs__list_menu_item_layout.xml b/library/res/layout/abs__list_menu_item_layout.xml
deleted file mode 100644
index 147f36f..0000000
--- a/library/res/layout/abs__list_menu_item_layout.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<com.actionbarsherlock.internal.view.menu.ListMenuItemView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="?attr/listPreferredItemHeightSmall">
-    
-    <!-- Icon will be inserted here. -->
-    
-    <!-- The title and summary have some gap between them, and this 'group' should be centered vertically. -->
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="?attr/listPreferredItemPaddingLeft"
-        android:layout_marginRight="?attr/listPreferredItemPaddingRight"
-        android:duplicateParentState="true">
-        
-        <TextView 
-            android:id="@+id/abs__title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentLeft="true"
-            android:textAppearance="?attr/textAppearanceListItemSmall"
-            android:singleLine="true"
-            android:duplicateParentState="true"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-
-        <TextView
-            android:id="@+id/abs__shortcut"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/abs__title"
-            android:layout_alignParentLeft="true"
-            android:textAppearance="?attr/textAppearanceSmall"
-            android:singleLine="true"
-            android:duplicateParentState="true" />
-
-    </RelativeLayout>
-
-    <!-- Checkbox, and/or radio button will be inserted here. -->
-    
-</com.actionbarsherlock.internal.view.menu.ListMenuItemView>
diff --git a/library/res/values-large/abs__dimens.xml b/library/res/values-large/abs__dimens.xml
deleted file mode 100644
index 63b12f7..0000000
--- a/library/res/values-large/abs__dimens.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/dimens.xml
-**
-** Copyright 2006, 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.
-*/
--->
-<resources>
-    <!-- The platform's desired minimum size for a dialog's width when it
-         is along the major axis (that is the screen is landscape).  This may
-         be either a fraction or a dimension. -->
-    <item type="dimen" name="abs__dialog_min_width_major">55%</item>
-    <!-- The platform's desired minimum size for a dialog's width when it
-         is along the minor axis (that is the screen is portrait).  This may
-         be either a fraction or a dimension. -->
-    <item type="dimen" name="abs__dialog_min_width_minor">80%</item>
-</resources>
diff --git a/library/src/com/actionbarsherlock/internal/ResourcesCompat.java b/library/src/com/actionbarsherlock/internal/ResourcesCompat.java
deleted file mode 100644
index 8e1efe8..0000000
--- a/library/src/com/actionbarsherlock/internal/ResourcesCompat.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.actionbarsherlock.internal;
-
-import android.content.Context;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import com.actionbarsherlock.R;
-
-public final class ResourcesCompat {
-    //No instances
-    private ResourcesCompat() {}
-
-
-    /**
-     * Support implementation of {@code getResources().getBoolean()} that we
-     * can use to simulate filtering based on width and smallest width
-     * qualifiers on pre-3.2.
-     *
-     * @param context Context to load booleans from on 3.2+ and to fetch the
-     * display metrics.
-     * @param id Id of boolean to load.
-     * @return Associated boolean value as reflected by the current display
-     * metrics.
-     */
-    public static boolean getResources_getBoolean(Context context, int id) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
-            return context.getResources().getBoolean(id);
-        }
-
-        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        float widthDp = metrics.widthPixels / metrics.density;
-        float heightDp = metrics.heightPixels / metrics.density;
-        float smallestWidthDp = (widthDp < heightDp) ? widthDp : heightDp;
-
-        if (id == R.bool.abs__action_bar_embed_tabs) {
-            if (widthDp >= 480) {
-                return true; //values-w480dp
-            }
-            return false; //values
-        }
-        if (id == R.bool.abs__split_action_bar_is_narrow) {
-            if (widthDp >= 480) {
-                return false; //values-w480dp
-            }
-            return true; //values
-        }
-        if (id == R.bool.abs__action_bar_expanded_action_views_exclusive) {
-            if (smallestWidthDp >= 600) {
-                return false; //values-sw600dp
-            }
-            return true; //values
-        }
-        if (id == R.bool.abs__config_allowActionMenuItemTextWithIcon) {
-            if (widthDp >= 480) {
-                return true; //values-w480dp
-            }
-            return false; //values
-        }
-
-        throw new IllegalArgumentException("Unknown boolean resource ID " + id);
-    }
-
-    /**
-     * Support implementation of {@code getResources().getInteger()} that we
-     * can use to simulate filtering based on width qualifiers on pre-3.2.
-     *
-     * @param context Context to load integers from on 3.2+ and to fetch the
-     * display metrics.
-     * @param id Id of integer to load.
-     * @return Associated integer value as reflected by the current display
-     * metrics.
-     */
-    public static int getResources_getInteger(Context context, int id) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
-            return context.getResources().getInteger(id);
-        }
-
-        DisplayMetrics metrics = context.getResources().getDisplayMetrics();
-        float widthDp = metrics.widthPixels / metrics.density;
-
-        if (id == R.integer.abs__max_action_buttons) {
-            if (widthDp >= 600) {
-                return 5; //values-w600dp
-            }
-            if (widthDp >= 500) {
-                return 4; //values-w500dp
-            }
-            if (widthDp >= 360) {
-                return 3; //values-w360dp
-            }
-            return 2; //values
-        }
-
-        throw new IllegalArgumentException("Unknown integer resource ID " + id);
-    }
-}
diff --git a/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java b/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
deleted file mode 100644
index ad1b4f0..0000000
--- a/library/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.actionbarsherlock.internal.widget;
-
-import static android.view.View.MeasureSpec.EXACTLY;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.widget.LinearLayout;
-import com.actionbarsherlock.R;
-
-public class FakeDialogPhoneWindow extends LinearLayout {
-    final TypedValue mMinWidthMajor = new TypedValue();
-    final TypedValue mMinWidthMinor = new TypedValue();
-
-    public FakeDialogPhoneWindow(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SherlockTheme);
-
-        a.getValue(R.styleable.SherlockTheme_windowMinWidthMajor, mMinWidthMajor);
-        a.getValue(R.styleable.SherlockTheme_windowMinWidthMinor, mMinWidthMinor);
-
-        a.recycle();
-    }
-
-    /* Stolen from PhoneWindow */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
-        final boolean isPortrait = metrics.widthPixels < metrics.heightPixels;
-
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-        int width = getMeasuredWidth();
-        boolean measure = false;
-
-        widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, EXACTLY);
-
-        final TypedValue tv = isPortrait ? mMinWidthMinor : mMinWidthMajor;
-
-        if (tv.type != TypedValue.TYPE_NULL) {
-            final int min;
-            if (tv.type == TypedValue.TYPE_DIMENSION) {
-                min = (int)tv.getDimension(metrics);
-            } else if (tv.type == TypedValue.TYPE_FRACTION) {
-                min = (int)tv.getFraction(metrics.widthPixels, metrics.widthPixels);
-            } else {
-                min = 0;
-            }
-
-            if (width < min) {
-                widthMeasureSpec = MeasureSpec.makeMeasureSpec(min, EXACTLY);
-                measure = true;
-            }
-        }
-
-        // TODO: Support height?
-
-        if (measure) {
-            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        }
-    }
-}
diff --git a/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java
deleted file mode 100644
index 1314248..0000000
--- a/library/test/com/actionbarsherlock/internal/ManifestParsingTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.actionbarsherlock.internal;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static com.actionbarsherlock.internal.ActionBarSherlockCompat.cleanActivityName;
-import com.xtremelabs.robolectric.RobolectricTestRunner;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(RobolectricTestRunner.class)
-public class ManifestParsingTest {
-    @Test
-    public void testFullyQualifiedClassName() {
-        String expected = "com.other.package.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", "com.other.package.SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-
-    @Test
-    public void testFullyQualifiedClassNameSamePackage() {
-        String expected = "com.jakewharton.test.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", "com.jakewharton.test.SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-
-    @Test
-    public void testUnqualifiedClassName() {
-        String expected = "com.jakewharton.test.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", "SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-
-    @Test
-    public void testRelativeClassName() {
-        String expected = "com.jakewharton.test.ui.SomeClass";
-        String actual = cleanActivityName("com.jakewharton.test", ".ui.SomeClass");
-        assertThat(expected, equalTo(actual));
-    }
-}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index db59c20..2225eae 100644..100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,255 +1,219 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
-	</parent>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>parent</artifactId>
-	<packaging>pom</packaging>
-	<version>4.1.0</version>
-
-	<name>ActionBarSherlock (Parent)</name>
-	<description>Android library for implementing the action bar design pattern using the backported sources of Ice Cream Sandwich.</description>
-	<url>http://actionbarsherlock.com</url>
-	<inceptionYear>2011</inceptionYear>
-
-	<modules>
-		<module>library</module>
-		<module>samples</module>
-	</modules>
-
-	<scm>
-		<url>https://github.com/JakeWharton/ActionBarSherlock/</url>
-		<connection>scm:git:git://github.com/JakeWharton/ActionBarSherlock.git</connection>
-		<developerConnection>scm:git:git@github.com:JakeWharton/ActionBarSherlock.git</developerConnection>
-	</scm>
-
-	<developers>
-		<developer>
-			<name>Jake Wharton</name>
-			<email>jakewharton@gmail.com</email>
-			<id>jakewharton</id>
-			<url>http://jakewharton.com</url>
-			<timezone>-5</timezone>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
-	</developers>
-
-	<licenses>
-		<license>
-			<name>Apache License Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-
-	<organization>
-		<name>Jake Wharton</name>
-		<url>http://jakewharton.com</url>
-	</organization>
-
-	<issueManagement>
-		<system>GitHub Issues</system>
-		<url>https://github.com/JakeWharton/ActionBarSherlock/issues</url>
-	</issueManagement>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-		<apk.prefix>actionbarsherlock</apk.prefix>
-
-		<java.version>1.6</java.version>
-		<android.version>4.0.1.2</android.version>
-		<android.platform>14</android.platform>
-		<android-support.version>r7</android-support.version>
-
-		<android-maven.version>3.1.1</android-maven.version>
-		<robolectric.version>1.1</robolectric.version>
-		<junit.version>4.10</junit.version>
-
-		<github.downloads.repositoryOwner>JakeWharton</github.downloads.repositoryOwner>
-		<github.downloads.repositoryName>ActionBarSherlock</github.downloads.repositoryName>
-	</properties>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>com.google.android</groupId>
-				<artifactId>android</artifactId>
-				<version>${android.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.google.android</groupId>
-				<artifactId>support-v4</artifactId>
-				<version>${android-support.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>com.pivotallabs</groupId>
-				<artifactId>robolectric</artifactId>
-				<version>${robolectric.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.3.2</version>
-					<configuration>
-						<source>${java.version}</source>
-						<target>${java.version}</target>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.8</version>
-				</plugin>
-
-				<plugin>
-					<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-					<artifactId>android-maven-plugin</artifactId>
-					<version>${android-maven.version}</version>
-					<extensions>true</extensions>
-					<configuration>
-						<sdk>
-							<platform>${android.platform}</platform>
-						</sdk>
-						<sign>
-							<debug>false</debug>
-						</sign>
-						<undeployBeforeDeploy>true</undeployBeforeDeploy>
-						<zipalign>
-							<inputApk>${project.build.directory}/${project.build.finalName}.apk</inputApk>
-							<outputApk>${project.build.directory}/${apk.prefix}-${project.artifactId}-${project.version}.apk</outputApk>
-						</zipalign>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jarsigner-plugin</artifactId>
-					<version>1.2</version>
-					<configuration>
-						<archive>${project.build.directory}/${apk.prefix}-${project.artifactId}-${project.version}.apk</archive>
-						<alias>ActionBarSherlock</alias>
-						<keypass>ActionBarSherlock</keypass>
-						<storepass>ActionBarSherlock</storepass>
-						<!-- Is always run from samples/xxx/ directory. -->
-						<keystore>../../debug.keystore</keystore>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-checkstyle-plugin</artifactId>
-					<version>2.9.1</version>
-					<configuration>
-						<failsOnError>true</failsOnError>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-site-plugin</artifactId>
-					<version>3.0</version>
-					<configuration>
-						<skip>true</skip>
-					</configuration>
-				</plugin>
-
-				<plugin>
-					<groupId>comm.github.github</groupId>
-					<artifactId>downloads-maven-plugin</artifactId>
-					<version>0.4</version>
-					<configuration>
-						<description>${project.name}</description>
-						<override>true</override>
-						<includeAttached>true</includeAttached>
-						<includes>
-							<include>*.apk</include>
-						</includes>
-						<excludes>
-							<exclude>*-unaligned.apk</exclude>
-						</excludes>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-release-plugin</artifactId>
-				<version>2.2.2</version>
-				<configuration>
-					<autoVersionSubmodules>true</autoVersionSubmodules>
-					<releaseProfiles>abs-release</releaseProfiles>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.wagon</groupId>
-						<artifactId>wagon-ssh</artifactId>
-						<version>1.0-beta-7</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-
-			<plugin>
-				<groupId>com.github.github</groupId>
-				<artifactId>site-maven-plugin</artifactId>
-				<version>0.5</version>
-				<executions>
-					<execution>
-						<phase>site</phase>
-						<goals>
-							<goal>site</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<message>Creating site for ${project.version}.</message>
-					<outputDirectory>website</outputDirectory>
-				</configuration>
-			</plugin>
-		</plugins>
-
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.scm</groupId>
-				<artifactId>maven-scm-provider-gitexe</artifactId>
-				<version>1.4</version>
-			</extension>
-			<extension>
-				<groupId>org.apache.maven.scm</groupId>
-				<artifactId>maven-scm-manager-plexus</artifactId>
-				<version>1.4</version>
-			</extension>
-		</extensions>
-	</build>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
+
+  <groupId>com.actionbarsherlock</groupId>
+  <artifactId>parent</artifactId>
+  <packaging>pom</packaging>
+  <version>4.3.1</version>
+
+  <name>ActionBarSherlock (Parent)</name>
+  <description>Android library for implementing the action bar design pattern using the backported sources of Ice Cream Sandwich.</description>
+  <url>http://actionbarsherlock.com</url>
+  <inceptionYear>2011</inceptionYear>
+
+  <modules>
+    <module>actionbarsherlock</module>
+    <module>actionbarsherlock-fest</module>
+    <module>actionbarsherlock-i18n</module>
+    <module>actionbarsherlock-samples</module>
+  </modules>
+
+  <scm>
+    <url>https://github.com/JakeWharton/ActionBarSherlock/</url>
+    <connection>scm:git:git://github.com/JakeWharton/ActionBarSherlock.git</connection>
+    <developerConnection>scm:git:git@github.com:JakeWharton/ActionBarSherlock.git</developerConnection>
+    <tag>4.3.1</tag>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Jake Wharton</name>
+      <email>jakewharton@gmail.com</email>
+      <id>jakewharton</id>
+      <url>http://jakewharton.com</url>
+      <timezone>-5</timezone>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Jake Wharton</name>
+    <url>http://jakewharton.com</url>
+  </organization>
+
+  <issueManagement>
+    <system>GitHub Issues</system>
+    <url>https://github.com/JakeWharton/ActionBarSherlock/issues</url>
+  </issueManagement>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    <java.version>1.6</java.version>
+    <android.platform>14</android.platform>
+
+    <!-- Compilation dependencies -->
+    <android.version>4.0.1.2</android.version>
+    <android-support.version>r7</android-support.version>
+    <fest.android.version>1.0.4</fest.android.version>
+
+    <!-- Sample dependencies -->
+    <nineoldandroids.version>2.4.0</nineoldandroids.version>
+    <roboguice-sherlock.version>1.5</roboguice-sherlock.version>
+
+    <!-- Test dependencies -->
+    <junit.version>4.10</junit.version>
+    <fest.version>2.0M10</fest.version>
+    <robolectric.version>2.0-alpha-2</robolectric.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.android</groupId>
+        <artifactId>android</artifactId>
+        <version>${android.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.android</groupId>
+        <artifactId>support-v4</artifactId>
+        <version>${android-support.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.nineoldandroids</groupId>
+        <artifactId>library</artifactId>
+        <version>${nineoldandroids.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.github.rtyley</groupId>
+        <artifactId>roboguice-sherlock</artifactId>
+        <version>${roboguice-sherlock.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.easytesting</groupId>
+        <artifactId>fest-assert-core</artifactId>
+        <version>${fest.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.robolectric</groupId>
+        <artifactId>robolectric</artifactId>
+        <version>${robolectric.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup</groupId>
+        <artifactId>fest-android</artifactId>
+        <version>${fest.android.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.0</version>
+          <configuration>
+            <source>${java.version}</source>
+            <target>${java.version}</target>
+            <showWarnings>true</showWarnings>
+            <compilerArguments>
+              <Xlint />
+            </compilerArguments>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+          <artifactId>android-maven-plugin</artifactId>
+          <version>3.5.3</version>
+          <configuration>
+            <nativeLibrariesDirectory>ignored</nativeLibrariesDirectory>
+            <sdk>
+              <platform>${android.platform}</platform>
+            </sdk>
+          </configuration>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.9</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.7</version>
+        </plugin>
+
+        <plugin>
+          <groupId>org.holoeverywhere</groupId>
+          <artifactId>resbuilder</artifactId>
+          <version>1.5.0</version>
+        </plugin>
+
+        <plugin>
+          <groupId>com.google.code.maven-replacer-plugin</groupId>
+          <artifactId>maven-replacer-plugin</artifactId>
+          <version>1.4.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <autoVersionSubmodules>true</autoVersionSubmodules>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.10</version>
+        <configuration>
+          <failsOnError>true</failsOnError>
+          <consoleOutput>true</consoleOutput>
+          <configLocation>checkstyle.xml</configLocation>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>checkstyle</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/samples/demos/pom.xml b/samples/demos/pom.xml
deleted file mode 100644
index c6a0146..0000000
--- a/samples/demos/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>sample-demos</artifactId>
-	<name>Sample: Demos</name>
-	<packaging>apk</packaging>
-
-	<parent>
-		<groupId>com.actionbarsherlock</groupId>
-		<artifactId>parent-sample</artifactId>
-		<version>4.1.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.actionbarsherlock</groupId>
-			<artifactId>library</artifactId>
-			<version>${project.version}</version>
-			<type>apklib</type>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>zipalign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jarsigner-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<configLocation>../../checkstyle.xml</configLocation>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>checkstyle</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>abs-release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>downloads-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>deploy</phase>
-								<goals>
-									<goal>upload</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/Dialog.java b/samples/demos/src/com/actionbarsherlock/sample/demos/Dialog.java
deleted file mode 100644
index a9dbaeb..0000000
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/Dialog.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2011 Jake Wharton
- *
- * 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.
- */
-package com.actionbarsherlock.sample.demos;
-
-import android.os.Bundle;
-import android.widget.TextView;
-import com.actionbarsherlock.app.SherlockActivity;
-
-public class Dialog extends SherlockActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.text);
-        ((TextView)findViewById(R.id.text)).setText(R.string.dialog_content);
-    }
-}
diff --git a/samples/demos/src/com/actionbarsherlock/sample/demos/ForcedOverflowItem.java b/samples/demos/src/com/actionbarsherlock/sample/demos/ForcedOverflowItem.java
deleted file mode 100644
index 3c8e3f1..0000000
--- a/samples/demos/src/com/actionbarsherlock/sample/demos/ForcedOverflowItem.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2011 Jake Wharton
- *
- * 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.
- */
-package com.actionbarsherlock.sample.demos;
-
-import android.os.Bundle;
-import android.widget.TextView;
-
-import com.actionbarsherlock.app.SherlockActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuItem;
-
-public class ForcedOverflowItem extends SherlockActivity {
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        //Used to put dark icons on light action bar
-        boolean isLight = SampleList.THEME == R.style.Theme_Sherlock_Light;
-
-        menu.add("Save")
-            .setIcon(isLight ? R.drawable.ic_compose_inverse : R.drawable.ic_compose)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        menu.add("Search")
-            .setIcon(isLight ? R.drawable.ic_search_inverse : R.drawable.ic_search)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        menu.add("Refresh")
-            .setIcon(isLight ? R.drawable.ic_refresh_inverse : R.drawable.ic_refresh)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        menu.add("Save")
-            .setIcon(isLight ? R.drawable.ic_compose_inverse : R.drawable.ic_compose)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        menu.add("Search")
-            .setIcon(isLight ? R.drawable.ic_search_inverse : R.drawable.ic_search)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        menu.add("Refresh")
-            .setIcon(isLight ? R.drawable.ic_refresh_inverse : R.drawable.ic_refresh)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-
-        return true;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        //Used for theme switching in samples
-        int theme = R.style.Theme_Sherlock_ForceOverflow;
-        if (SampleList.THEME == R.style.Theme_Sherlock_Light) {
-            theme = R.style.Theme_Sherlock_Light_ForceOverflow;
-        } else if (SampleList.THEME == R.style.Theme_Sherlock_Light_DarkActionBar) {
-            theme = R.style.Theme_Sherlock_Light_DarkActionBar_ForceOverflow;
-        }
-        setTheme(theme);
-
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.text);
-        ((TextView)findViewById(R.id.text)).setText(R.string.forced_overflow_content);
-    }
-}
diff --git a/samples/fragments/pom.xml b/samples/fragments/pom.xml
deleted file mode 100644
index 749f46f..0000000
--- a/samples/fragments/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>sample-fragments</artifactId>
-	<name>Sample: Fragments</name>
-	<packaging>apk</packaging>
-
-	<parent>
-		<groupId>com.actionbarsherlock</groupId>
-		<artifactId>parent-sample</artifactId>
-		<version>4.1.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.actionbarsherlock</groupId>
-			<artifactId>library</artifactId>
-			<version>${project.version}</version>
-			<type>apklib</type>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>zipalign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jarsigner-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<configLocation>../../checkstyle.xml</configLocation>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>checkstyle</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>abs-release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>downloads-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>deploy</phase>
-								<goals>
-									<goal>upload</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/samples/known-bugs/AndroidManifest.xml b/samples/known-bugs/AndroidManifest.xml
deleted file mode 100644
index f0bc587..0000000
--- a/samples/known-bugs/AndroidManifest.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock.sample.knownbugs">
-
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
-
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-
-    <application android:icon="@drawable/icon" android:label="@string/application_name" android:theme="@style/Theme.Sherlock">
-
-        <activity android:label="@string/activity_name" android:name=".SampleList">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
-
-        <!-- OPEN BUGS -->
-
-        <activity android:label="Issue #331" android:name=".Issue331">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="com.actionbarsherlock.sample.knownbugs.OPEN"/>
-            </intent-filter>
-        </activity>
-
-
-        <!-- CLOSED BUGS -->
-
-        <activity android:label="Issue #425" android:name=".Issue435">
-            <!-- Fixed in 4.1.0 -->
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="com.actionbarsherlock.sample.knownbugs.CLOSED"/>
-            </intent-filter>
-        </activity>
-
-    </application>
-</manifest>
diff --git a/samples/known-bugs/pom.xml b/samples/known-bugs/pom.xml
deleted file mode 100644
index 543f3a6..0000000
--- a/samples/known-bugs/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>sample-known-bugs</artifactId>
-	<name>Sample: Known Bugs</name>
-	<packaging>apk</packaging>
-
-	<parent>
-		<groupId>com.actionbarsherlock</groupId>
-		<artifactId>parent-sample</artifactId>
-		<version>4.1.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.actionbarsherlock</groupId>
-			<artifactId>library</artifactId>
-			<version>${project.version}</version>
-			<type>apklib</type>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>zipalign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jarsigner-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<configLocation>../../checkstyle.xml</configLocation>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>checkstyle</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>abs-release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>downloads-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>deploy</phase>
-								<goals>
-									<goal>upload</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/samples/pom.xml b/samples/pom.xml
deleted file mode 100644
index 4ceae5c..0000000
--- a/samples/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>parent-sample</artifactId>
-	<name>Sample (Parent)</name>
-	<packaging>pom</packaging>
-
-	<parent>
-		<groupId>com.actionbarsherlock</groupId>
-		<artifactId>parent</artifactId>
-		<version>4.1.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<modules>
-		<module>demos</module>
-		<module>fragments</module>
-		<module>known-bugs</module>
-		<module>roboguice</module>
-		<module>styled</module>
-	</modules>
-</project>
diff --git a/samples/roboguice/pom.xml b/samples/roboguice/pom.xml
deleted file mode 100644
index 385847b..0000000
--- a/samples/roboguice/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>sample-roboguice</artifactId>
-	<name>Sample: RoboGuice</name>
-	<packaging>apk</packaging>
-
-	<parent>
-		<groupId>com.actionbarsherlock</groupId>
-		<artifactId>parent-sample</artifactId>
-		<version>4.1.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.actionbarsherlock</groupId>
-			<artifactId>library</artifactId>
-			<version>${project.version}</version>
-			<type>apklib</type>
-		</dependency>
-
-		<!-- https://github.com/rtyley/roboguice-sherlock -->
-		<dependency>
-			<groupId>com.github.rtyley</groupId>
-			<artifactId>roboguice-sherlock</artifactId>
-			<version>1.4</version>
-		</dependency>
-	</dependencies>
-
-	<repositories>
-		<repository>
-			<id>oss-sonatype</id>
-			<name>oss-sonatype</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>zipalign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jarsigner-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<configLocation>../../checkstyle.xml</configLocation>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>checkstyle</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>abs-release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>downloads-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>deploy</phase>
-								<goals>
-									<goal>upload</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/samples/styled/pom.xml b/samples/styled/pom.xml
deleted file mode 100644
index f853945..0000000
--- a/samples/styled/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.actionbarsherlock</groupId>
-	<artifactId>sample-styled</artifactId>
-	<name>Sample: Styled</name>
-	<packaging>apk</packaging>
-
-	<parent>
-		<groupId>com.actionbarsherlock</groupId>
-		<artifactId>parent-sample</artifactId>
-		<version>4.1.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.actionbarsherlock</groupId>
-			<artifactId>library</artifactId>
-			<version>${project.version}</version>
-			<type>apklib</type>
-		</dependency>
-		<dependency>
-			<groupId>com.nineoldandroids</groupId>
-			<artifactId>library</artifactId>
-			<version>2.2.0</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<sourceDirectory>src</sourceDirectory>
-		<finalName>${apk.prefix}-${project.artifactId}-${project.version}-unaligned</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<extensions>true</extensions>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>zipalign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jarsigner-plugin</artifactId>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<configuration>
-					<configLocation>../../checkstyle.xml</configLocation>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>verify</phase>
-						<goals>
-							<goal>checkstyle</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>abs-release</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.github.github</groupId>
-						<artifactId>downloads-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>deploy</phase>
-								<goals>
-									<goal>upload</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/website/.gitignore b/website/.gitignore
index 0815732..0815732 100644..100755
--- a/website/.gitignore
+++ b/website/.gitignore
diff --git a/website/CNAME b/website/CNAME
index 87a75d9..87a75d9 100644..100755
--- a/website/CNAME
+++ b/website/CNAME
diff --git a/website/_config.yml b/website/_config.yml
index a84334a..a84334a 100644..100755
--- a/website/_config.yml
+++ b/website/_config.yml
diff --git a/website/_layouts/default.html b/website/_layouts/default.html
index 3fedeb6..3fedeb6 100644..100755
--- a/website/_layouts/default.html
+++ b/website/_layouts/default.html
diff --git a/website/development.html b/website/development.html
index 9bcab18..e666197 100644..100755
--- a/website/development.html
+++ b/website/development.html
@@ -15,13 +15,16 @@ layout: default
 		<pre>export ANDROID_HOME=/home/jake/vendor/android_sdk/</pre>

 

 		<h3 id="compiling">Compiling</h3>

-		<p>Once the prerequisites have been successfully installed, building is as easy as running <code>mvn clean package</code>. The <code>apklib</code> for the library will be located in the <code>library/target/</code> folder.</p>

+		<p>Once the prerequisites have been successfully installed, building is as easy as running <code>mvn clean package</code>. The <code>apklib</code> for the library will be located in the <code>actionbarsherlock/target/</code> folder.</p>

 		<p>You can find a <code>jar</code> for each plugin in its respective <code>target/</code> folder. The <code>apk</code>s for each of the samples are their respective <code>target/</code> folders as well.</p>

 

 		<h3 id="ide">IDE</h3>

 		<p>Even though the project uses Maven, each folder within the repository still maintains the standard Android project layout. By specifying the desired folder as an existing source for a new Android project, you should be able to successfully import the sources.</p>

 		<p>The library should be created as a project first. Any plugins and/or sample applications you also wish to create projects for can then be created.</p>

 		<p>If your IDE supports Maven you can point it at the parent <code>pom.xml</code> file in the root of the repository which will load all of the modules automatically.</p>

+

+		<h3 id="codestyle">Code Style</h3>

+		<p>Since a large portion of the source code is ported from the Android Open Source Project its conventions are followed in ActionBarSherlock. Detailed information can be found on <a href="http://s.android.com/source/code-style.html">the AOSP Code Guidelines</a> page.</p>

 	</div>

 	<div class="fourth last">

 		<h1>Getting The Code</h1>

diff --git a/website/download.html b/website/download.html
index 92dd17a..9a86ec0 100644..100755
--- a/website/download.html
+++ b/website/download.html
@@ -99,10 +99,12 @@ $(function() {
 			<dt class="normal">(loading)</dt>

 		</dl>

 

-		<h3>Third-Party Plugins</h3>

+		<h3>Third-Party Tools</h3>

 		<dl id="third-party">

 			<dt class="normal"><a href="https://github.com/rtyley/roboguice-sherlock">RoboGuice-Sherlock</a> &mdash; Roberto Tyley</dt>

 			<dd class="plugin">Base activities and base fragments which allow for easy use of RoboGuice and ActionBarSherlock together.</dd>

+			<dt class="normal"><a href="http://jgilfelt.github.com/android-actionbarstylegenerator/">Action Bar Style Generator</a> &mdash; Jeff Gilfelt</dt>

+			<dd class="plugin">Allows you to easily create a simple, attractive and seamless custom action bar style for your Android application. It will generate all necessary nine patch assets plus associated XML drawables and styles which you can copy straight into your project.</dd>

 		</dl>

 	</div>

 	<div class="fourth last">

diff --git a/website/faq.html b/website/faq.html
index 4d7d43f..b4d9d64 100644..100755
--- a/website/faq.html
+++ b/website/faq.html
@@ -26,7 +26,7 @@ layout: default
 			</tr>

 			<tr>

 				<th>What API level should I compile with if I want to use the library?</th>

-				<td>The library itself must be built against Android 4.0 (API level 14). Your project should be built using the latest version of the SDK as possible as long as it is 4.0 or newer.</td>

+				<td>Use of this library requires that both it and your project are compiled with Android 4.0 (API 14) or newer.</td>

 			</tr>

 			<tr>

 				<th>What API level should I target in my manifest when using the library?</th>

diff --git a/website/favicon.ico b/website/favicon.ico
index 0b9f03e..0b9f03e 100644..100755
--- a/website/favicon.ico
+++ b/website/favicon.ico
diff --git a/website/humans.txt b/website/humans.txt
index 9eae994..9eae994 100644..100755
--- a/website/humans.txt
+++ b/website/humans.txt
diff --git a/website/index.html b/website/index.html
index 4a1a1d5..4762ba7 100644..100755
--- a/website/index.html
+++ b/website/index.html
@@ -50,7 +50,7 @@
 			<div class="row">
 				<div class="half" id="feature">
 					<p id="header"><a class="img" href="index.html"><img src="static/logo.png" alt="Home"/></a></p>
-					<p class="lead">ActionBarSherlock is an extension of the <a href="http://developer.android.com/sdk/compatibility-library.html">compatibility library</a> designed to facilitate the use of the action bar design pattern across all versions of Android with a single API.</p>
+					<p class="lead">ActionBarSherlock is an extension of the <a href="http://developer.android.com/sdk/compatibility-library.html">support library</a> designed to facilitate the use of the action bar design pattern across all versions of Android with a single API.</p>
 					<div id="sherlock"><a href="merch-and-donations.html"><img src="static/mascot.png" alt="Donations &amp; Merhandise" title="Buy me on a shirt!"/></a></div>
 					<p>The library will automatically use the native action bar when appropriate or will automatically wrap a custom implementation around your layouts. This allows you to easily develop an application with an action bar for every version of Android from 2.x and up.</p>
 					<div id="download">
@@ -85,7 +85,7 @@
 					<h1>Resources</h1>
 					<dl>
 						<dt><a href="faq.html">Frequently Asked Questions</a></dt>
-						<dd>Common pitfals and their solutions.</dd>
+						<dd>Common pitfalls and their solutions.</dd>
 						<dt><a href="support.html">Help &amp; Support</a></dt>
 						<dd>Places to go when you need assistance with implementation.</dd>
 						<dt><a href="development.html">Development</a></dt>
@@ -104,17 +104,17 @@
 					<div class="half app">
 						<img src="static/apps/com.squareup.cardcase.png"/>
 						<div class="info">
-							<h4>Pay with Square</h4>
-							<p class="desc">Pay with your name using Square. Leave your wallet at home and simply give your name at checkout. Find businesses you love, share favorites and be rewarded.</p>
-							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.squareup.cardcase">View on Play Market</a></p>
+							<h4>Square Wallet</h4>
+							<p class="desc">Fumbling for cash or plastic is a thing of the past. With Square Wallet, you just say your name to pay. Square Wallet also helps you discover nearby merchants and earn rewards.</p>
+							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.squareup.cardcase">View on Play Store</a></p>
 						</div>
 					</div>
 					<div class="half app last">
-						<img src="static/apps/com.github.android.gauges.png"/>
+						<img src="static/apps/com.github.mobile.png"/>
 						<div class="info">
-							<h4>GitHub Gaug.es</h4>
-							<p class="desc">Gaug.es is the most simple and beautiful way to track multiple sites and see live reporting on all of them from one convenient dashboard.</p>
-							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.github.mobile.gauges">View on Play Market</a> &middot; <a href="https://github.com/GitHub/gauges-android">View GitHub project</a></p>
+							<h4>GitHub</h4>
+							<p class="desc">Create, manage, and discuss issues and stay up to date with an integrated news feed for all your organizations, friends, and repositories.</p>
+							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.github.mobile">View on Play Store</a> &middot; <a href="https://github.com/github/android">View GitHub project</a></p>
 						</div>
 					</div>
 				</div>
@@ -124,15 +124,15 @@
 						<div class="info">
 							<h4>SeriesGuide Show Manager</h4>
 							<p class="desc">Manage the progress of (re-)watching your favorite TV shows. Keep track of which episodes you still have to watch or which ones are upcoming.</p>
-							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.battlelancer.seriesguide">View on Play Market</a> &middot; <a href="https://github.com/UweTrottmann/SeriesGuide">View GitHub project</a></p>
+							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.battlelancer.seriesguide">View on Play Store</a> &middot; <a href="https://github.com/UweTrottmann/SeriesGuide">View GitHub project</a></p>
 						</div>
 					</div>
 					<div class="half app last">
-						<img src="static/apps/com.androiduipatterns.mentionobserver.png"/>
+						<img src="static/apps/com.joelapenna.foursquared.png"/>
 						<div class="info">
-							<h4>Mentions</h4>
-							<p class="desc">Mentions will monitor twitter and reddit and keep you updated whenever someone has something to say.</p>
-							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.androiduipatterns.mentionobserver">View on Play Market</a></p>
+							<h4>Foursquare</h4>
+							<p class="desc">Heading out? foursquare helps you and your friends make the most of where you are. Join the over 20 million people who are already on foursquare.</p>
+							<p class="links"><a href="https://play.google.com/store/apps/details?id=com.joelapenna.foursquared">View on Play Store</a></p>
 						</div>
 					</div>
 				</div>
diff --git a/website/merch-and-donations.html b/website/merch-and-donations.html
index c7663e6..c7663e6 100644..100755
--- a/website/merch-and-donations.html
+++ b/website/merch-and-donations.html
diff --git a/website/migration.html b/website/migration.html
index c44605a..c44605a 100644..100755
--- a/website/migration.html
+++ b/website/migration.html
diff --git a/website/robots.txt b/website/robots.txt
index cb4bc85..cb4bc85 100644..100755
--- a/website/robots.txt
+++ b/website/robots.txt
diff --git a/website/samples.html b/website/samples.html
index 092577c..a46b240 100644..100755
--- a/website/samples.html
+++ b/website/samples.html
@@ -7,32 +7,40 @@ layout: default
 	<div class="three-fourths">

 		<h1>Library Samples</h1>

 		<p>The library comes with three samples, each of which demonstrate a different use case of ActionBarSherlock.</p>

-		<p>A compiled <code>.apk</code> for each sample can be downloaded under the &quot;Sample Applications&quot; section of the <a href="download.html">download page</a>. You can obtain the source code for each in the <a href="https://github.com/JakeWharton/ActionBarSherlock/tree/master/samples"><code>samples/</code> directory</a> of the repository.</p>

+		<p>A compiled <code>.apk</code> for the samples can be downloaded under the &quot;Sample Applications&quot; section of the <a href="download.html">download page</a>. You can obtain the source code for each in the <a href="https://github.com/JakeWharton/ActionBarSherlock/tree/master/samples"><code>samples/</code> directory</a> of the repository.</p>

 

 		<h3>Demos</h3>

 		<p>The demo sample is a showcase of the functionality of the library and its action bar. There is an example for nearly every major feature of the library and you should refer to the source code for each activity for the proper way to use each.</p>

-		<p><em>Screenshots coming soon.</em></p>

 

 		<h3>Fragments</h3>

 		<p>This sample is simply the 'API Demos' sample from the Android support library ported to use <code>SherlockFragmentActivity</code> and <code>SherlockFragment</code>. It should provide a good idea of how these two classes are used to replace <code>FragmentActivity</code> and <code>Fragment</code>.</p>

-		<p><em>Screenshots coming soon.</em></p>

 

 		<h3>RoboGuice</h3>

 		<p>A port of one of the RoboGuice sample applications which shows how you can combine two libraries which require the use of base activities.</p>

-		<p><em>Screenshots coming soon.</em></p>

+

+		<h3>Styled</h3>

+		<p>This sample is adapted from a blog post by Nick Butcher which demonstrates how to style various action bar components. While originally targetted at Honeycomb tablets, this sample still provides a good starter for styling.</p>

+

+		<h3>Known Bugs</h3>

+		<p>Unlike the others, this sample application's sole purpose it to demonstrate known bugs with the library. These oftentimes will be framework-related which need fixed in Android before they can be fixed in the library.</p>

 	</div>

 	<div class="fourth last">

 		<h1>Open-Source Examples</h1>

 		<p>The following are open-source applications which implement ActionBarSherlock in an exemplary fashion. These should provide a more realistic view of what implementation is like provide solutions for common implementation problems.</p>

 

+		<h3>GitHub Mobile</h3>

+		<p><em>GitHub is the best way to collaborate with others. Create, manage, and discuss issues and stay up to date with an integrated news feed for all your organizations, friends, and repositories.</em></p>

+		<p>The main GitHub app is a very clean and content-driven application which uses ActionBarSherlock as well as a lot of other open source libraries. It is a great reference for some best-practices.</p>

+		<p><a href="https://play.google.com/store/apps/details?id=com.github.mobile">Play Store</a> &middot; <a href="https://github.com/github/android">GitHub</a></p>

+

 		<h3>SeriesGuide Show Manager</h3>

 		<p><em>&quot;Manage the progress of (re-)watching your favorite TV shows. Keep track of which episodes you still have to watch or which ones are upcoming.&quot;</em></p>

 		<p>The SeriesGuide application has implemented ActionBarSherlock for a very long time and coupled with heavy use of fragments has allowed for very dynamic layouts that scale well to every screen size.</p>

-		<p><a href="https://market.android.com/details?id=com.battlelancer.seriesguide">Play Market</a> &middot; <a href="https://github.com/UweTrottmann/SeriesGuide">GitHub</a></p>

+		<p><a href="https://market.android.com/details?id=com.battlelancer.seriesguide">Play Store</a> &middot; <a href="https://github.com/UweTrottmann/SeriesGuide">GitHub</a></p>

 

-		<h3>GitHub Gaug.es</h3>

-		<p><em>&quot;Gaug.es is the most simple and beautiful way to track multiple sites and see live reporting on all of them from one convenient dashboard.&quot;</em></p>

-		<p>The Gaug.es application by GitHub is a relatively simple application but shows how you can use ActionBarSherlock with simple styling to create a polished and unique look to your applications that matches your branding.</p>

-		<p><a href="https://play.google.com/store/apps/details?id=com.github.mobile.gauges">Play Market</a> &middot; <a href="https://github.com/github/gauges-android">GitHub</a></p>

+		<h3>Google I/O 2012</h3>

+		<p><em>The official Google I/O 2012 conference app.</em></p>

+		<p>Google's official scheduling application for the I/O developer conference. This application is great reference for some best practices and does an especially well job of showing how to provide layouts for all devices.</p>

+		<p><a href="https://play.google.com/store/apps/details?id=com.google.android.apps.iosched">Play Store</a> &middot; <a href="http://code.google.com/p/iosched/">Google Code</a></p>

 	</div>

 </div>

diff --git a/website/sitemap.xml b/website/sitemap.xml
index cdbe22c..cdbe22c 100644..100755
--- a/website/sitemap.xml
+++ b/website/sitemap.xml
diff --git a/website/static/1120.css b/website/static/1120.css
index 2d8ebca..2d8ebca 100644..100755
--- a/website/static/1120.css
+++ b/website/static/1120.css
diff --git a/website/static/apps/com.androiduipatterns.mentionobserver.png b/website/static/apps/com.androiduipatterns.mentionobserver.png
deleted file mode 100644
index abaaaa2..0000000
--- a/website/static/apps/com.androiduipatterns.mentionobserver.png
+++ /dev/null
diff --git a/website/static/apps/com.battlelancer.seriesguide.png b/website/static/apps/com.battlelancer.seriesguide.png
index 926e618..7d8fe99 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide.png
+++ b/website/static/apps/com.battlelancer.seriesguide.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.png b/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.png
index 8ac6825..8ac6825 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.png
+++ b/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.thumb.png b/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.thumb.png
index a43e3c6..a43e3c6 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.thumb.png
+++ b/website/static/apps/com.battlelancer.seriesguide_01_2.3.4.thumb.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_01_3.0.png b/website/static/apps/com.battlelancer.seriesguide_01_3.0.png
index 47be7f7..47be7f7 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_01_3.0.png
+++ b/website/static/apps/com.battlelancer.seriesguide_01_3.0.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_01_3.0.thumb.png b/website/static/apps/com.battlelancer.seriesguide_01_3.0.thumb.png
index 15807a6..15807a6 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_01_3.0.thumb.png
+++ b/website/static/apps/com.battlelancer.seriesguide_01_3.0.thumb.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.png b/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.png
index 976e134..976e134 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.png
+++ b/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.thumb.png b/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.thumb.png
index 7d4d5f1..7d4d5f1 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.thumb.png
+++ b/website/static/apps/com.battlelancer.seriesguide_02_2.3.4.thumb.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_02_3.0.png b/website/static/apps/com.battlelancer.seriesguide_02_3.0.png
index 9e1932e..9e1932e 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_02_3.0.png
+++ b/website/static/apps/com.battlelancer.seriesguide_02_3.0.png
diff --git a/website/static/apps/com.battlelancer.seriesguide_02_3.0.thumb.png b/website/static/apps/com.battlelancer.seriesguide_02_3.0.thumb.png
index 1b14a5c..1b14a5c 100644..100755
--- a/website/static/apps/com.battlelancer.seriesguide_02_3.0.thumb.png
+++ b/website/static/apps/com.battlelancer.seriesguide_02_3.0.thumb.png
diff --git a/website/static/apps/com.github.android.gauges.png b/website/static/apps/com.github.android.gauges.png
deleted file mode 100644
index 1823a6f..0000000
--- a/website/static/apps/com.github.android.gauges.png
+++ /dev/null
diff --git a/website/static/apps/com.github.mobile.png b/website/static/apps/com.github.mobile.png
new file mode 100755
index 0000000..7c7a19d
--- /dev/null
+++ b/website/static/apps/com.github.mobile.png
diff --git a/website/static/apps/com.joelapenna.foursquared.png b/website/static/apps/com.joelapenna.foursquared.png
new file mode 100755
index 0000000..972e5d7
--- /dev/null
+++ b/website/static/apps/com.joelapenna.foursquared.png
diff --git a/website/static/apps/com.squareup.cardcase.png b/website/static/apps/com.squareup.cardcase.png
index ec7eb55..7f5b19b 100644..100755
--- a/website/static/apps/com.squareup.cardcase.png
+++ b/website/static/apps/com.squareup.cardcase.png
diff --git a/website/static/black_linen_v2.png b/website/static/black_linen_v2.png
index d125b4b..d125b4b 100644..100755
--- a/website/static/black_linen_v2.png
+++ b/website/static/black_linen_v2.png
diff --git a/website/static/border.png b/website/static/border.png
index f463a10..f463a10 100644..100755
--- a/website/static/border.png
+++ b/website/static/border.png
diff --git a/website/static/controls.png b/website/static/controls.png
index 9257176..9257176 100644..100755
--- a/website/static/controls.png
+++ b/website/static/controls.png
diff --git a/website/static/css3-mediaqueries.js b/website/static/css3-mediaqueries.js
index 1ea806d..1ea806d 100644..100755
--- a/website/static/css3-mediaqueries.js
+++ b/website/static/css3-mediaqueries.js
diff --git a/website/static/down_grey.png b/website/static/down_grey.png
index 770106c..770106c 100644..100755
--- a/website/static/down_grey.png
+++ b/website/static/down_grey.png
diff --git a/website/static/feature.png b/website/static/feature.png
index a15b531..a15b531 100644..100755
--- a/website/static/feature.png
+++ b/website/static/feature.png
diff --git a/website/static/feature_01.png b/website/static/feature_01.png
index 8379aea..8379aea 100644..100755
--- a/website/static/feature_01.png
+++ b/website/static/feature_01.png
diff --git a/website/static/feature_02.png b/website/static/feature_02.png
index f85f62a..f85f62a 100644..100755
--- a/website/static/feature_02.png
+++ b/website/static/feature_02.png
diff --git a/website/static/feature_03.png b/website/static/feature_03.png
index 46eb394..46eb394 100644..100755
--- a/website/static/feature_03.png
+++ b/website/static/feature_03.png
diff --git a/website/static/icon_web.png b/website/static/icon_web.png
index e4eb169..e4eb169 100644..100755
--- a/website/static/icon_web.png
+++ b/website/static/icon_web.png
diff --git a/website/static/ie.css b/website/static/ie.css
index 530c113..530c113 100644..100755
--- a/website/static/ie.css
+++ b/website/static/ie.css
diff --git a/website/static/jquery.colorbox-min.js b/website/static/jquery.colorbox-min.js
index 689a007..689a007 100644..100755
--- a/website/static/jquery.colorbox-min.js
+++ b/website/static/jquery.colorbox-min.js
diff --git a/website/static/jquery.cross-slide.min.js b/website/static/jquery.cross-slide.min.js
index 2d60480..2d60480 100644..100755
--- a/website/static/jquery.cross-slide.min.js
+++ b/website/static/jquery.cross-slide.min.js
diff --git a/website/static/loading.gif b/website/static/loading.gif
index d3b3b9f..d3b3b9f 100644..100755
--- a/website/static/loading.gif
+++ b/website/static/loading.gif
diff --git a/website/static/loading_background.png b/website/static/loading_background.png
index 6ae83e6..6ae83e6 100644..100755
--- a/website/static/loading_background.png
+++ b/website/static/loading_background.png
diff --git a/website/static/logo.png b/website/static/logo.png
index 2bdd61b..2bdd61b 100644..100755
--- a/website/static/logo.png
+++ b/website/static/logo.png
diff --git a/website/static/logo.psd b/website/static/logo.psd
index e79105a..e79105a 100644..100755
--- a/website/static/logo.psd
+++ b/website/static/logo.psd
diff --git a/website/static/logo_small.png b/website/static/logo_small.png
index 0c29d24..0c29d24 100644..100755
--- a/website/static/logo_small.png
+++ b/website/static/logo_small.png
diff --git a/website/static/mascot.png b/website/static/mascot.png
index 4b9b522..4b9b522 100644..100755
--- a/website/static/mascot.png
+++ b/website/static/mascot.png
diff --git a/website/static/merch.png b/website/static/merch.png
index 326a717..326a717 100644..100755
--- a/website/static/merch.png
+++ b/website/static/merch.png
diff --git a/website/static/octocat.png b/website/static/octocat.png
index 2d4fa85..2d4fa85 100644..100755
--- a/website/static/octocat.png
+++ b/website/static/octocat.png
diff --git a/website/static/overlay.png b/website/static/overlay.png
index 53ea98f..53ea98f 100644..100755
--- a/website/static/overlay.png
+++ b/website/static/overlay.png
diff --git a/website/static/ribbon.png b/website/static/ribbon.png
index 10c08f4..10c08f4 100644..100755
--- a/website/static/ribbon.png
+++ b/website/static/ribbon.png
diff --git a/website/static/samples/featuredemo_01_1.6.png b/website/static/samples/featuredemo_01_1.6.png
index 8827f74..8827f74 100644..100755
--- a/website/static/samples/featuredemo_01_1.6.png
+++ b/website/static/samples/featuredemo_01_1.6.png
diff --git a/website/static/samples/featuredemo_01_1.6.thumb.png b/website/static/samples/featuredemo_01_1.6.thumb.png
index 9181b53..9181b53 100644..100755
--- a/website/static/samples/featuredemo_01_1.6.thumb.png
+++ b/website/static/samples/featuredemo_01_1.6.thumb.png
diff --git a/website/static/samples/featuredemo_01_2.3.3.png b/website/static/samples/featuredemo_01_2.3.3.png
index 758cedc..758cedc 100644..100755
--- a/website/static/samples/featuredemo_01_2.3.3.png
+++ b/website/static/samples/featuredemo_01_2.3.3.png
diff --git a/website/static/samples/featuredemo_01_2.3.3.thumb.png b/website/static/samples/featuredemo_01_2.3.3.thumb.png
index ebbe669..ebbe669 100644..100755
--- a/website/static/samples/featuredemo_01_2.3.3.thumb.png
+++ b/website/static/samples/featuredemo_01_2.3.3.thumb.png
diff --git a/website/static/samples/featuredemo_01_3.1.png b/website/static/samples/featuredemo_01_3.1.png
index cb39e65..cb39e65 100644..100755
--- a/website/static/samples/featuredemo_01_3.1.png
+++ b/website/static/samples/featuredemo_01_3.1.png
diff --git a/website/static/samples/featuredemo_01_3.1.thumb.png b/website/static/samples/featuredemo_01_3.1.thumb.png
index 5ffebc7..5ffebc7 100644..100755
--- a/website/static/samples/featuredemo_01_3.1.thumb.png
+++ b/website/static/samples/featuredemo_01_3.1.thumb.png
diff --git a/website/static/samples/featuredemo_02_1.6.png b/website/static/samples/featuredemo_02_1.6.png
index b404ff9..b404ff9 100644..100755
--- a/website/static/samples/featuredemo_02_1.6.png
+++ b/website/static/samples/featuredemo_02_1.6.png
diff --git a/website/static/samples/featuredemo_02_1.6.thumb.png b/website/static/samples/featuredemo_02_1.6.thumb.png
index 3c871d8..3c871d8 100644..100755
--- a/website/static/samples/featuredemo_02_1.6.thumb.png
+++ b/website/static/samples/featuredemo_02_1.6.thumb.png
diff --git a/website/static/samples/featuredemo_02_2.3.3.png b/website/static/samples/featuredemo_02_2.3.3.png
index af4ee1e..af4ee1e 100644..100755
--- a/website/static/samples/featuredemo_02_2.3.3.png
+++ b/website/static/samples/featuredemo_02_2.3.3.png
diff --git a/website/static/samples/featuredemo_02_2.3.3.thumb.png b/website/static/samples/featuredemo_02_2.3.3.thumb.png
index 796dc41..796dc41 100644..100755
--- a/website/static/samples/featuredemo_02_2.3.3.thumb.png
+++ b/website/static/samples/featuredemo_02_2.3.3.thumb.png
diff --git a/website/static/samples/featuredemo_02_3.1.png b/website/static/samples/featuredemo_02_3.1.png
index ef74fbb..ef74fbb 100644..100755
--- a/website/static/samples/featuredemo_02_3.1.png
+++ b/website/static/samples/featuredemo_02_3.1.png
diff --git a/website/static/samples/featuredemo_02_3.1.thumb.png b/website/static/samples/featuredemo_02_3.1.thumb.png
index b9061a4..b9061a4 100644..100755
--- a/website/static/samples/featuredemo_02_3.1.thumb.png
+++ b/website/static/samples/featuredemo_02_3.1.thumb.png
diff --git a/website/static/samples/shakespeare_01_1.6.png b/website/static/samples/shakespeare_01_1.6.png
index 82a318a..82a318a 100644..100755
--- a/website/static/samples/shakespeare_01_1.6.png
+++ b/website/static/samples/shakespeare_01_1.6.png
diff --git a/website/static/samples/shakespeare_01_1.6.thumb.png b/website/static/samples/shakespeare_01_1.6.thumb.png
index 97d28a5..97d28a5 100644..100755
--- a/website/static/samples/shakespeare_01_1.6.thumb.png
+++ b/website/static/samples/shakespeare_01_1.6.thumb.png
diff --git a/website/static/samples/shakespeare_01_2.3.3.png b/website/static/samples/shakespeare_01_2.3.3.png
index d1cdd22..d1cdd22 100644..100755
--- a/website/static/samples/shakespeare_01_2.3.3.png
+++ b/website/static/samples/shakespeare_01_2.3.3.png
diff --git a/website/static/samples/shakespeare_01_2.3.3.thumb.png b/website/static/samples/shakespeare_01_2.3.3.thumb.png
index 73026b1..73026b1 100644..100755
--- a/website/static/samples/shakespeare_01_2.3.3.thumb.png
+++ b/website/static/samples/shakespeare_01_2.3.3.thumb.png
diff --git a/website/static/samples/shakespeare_01_3.1.png b/website/static/samples/shakespeare_01_3.1.png
index 9710a4b..9710a4b 100644..100755
--- a/website/static/samples/shakespeare_01_3.1.png
+++ b/website/static/samples/shakespeare_01_3.1.png
diff --git a/website/static/samples/shakespeare_01_3.1.thumb.png b/website/static/samples/shakespeare_01_3.1.thumb.png
index 2d59ce6..2d59ce6 100644..100755
--- a/website/static/samples/shakespeare_01_3.1.thumb.png
+++ b/website/static/samples/shakespeare_01_3.1.thumb.png
diff --git a/website/static/samples/shakespeare_02_2.3.3.png b/website/static/samples/shakespeare_02_2.3.3.png
index 2b515c2..2b515c2 100644..100755
--- a/website/static/samples/shakespeare_02_2.3.3.png
+++ b/website/static/samples/shakespeare_02_2.3.3.png
diff --git a/website/static/samples/shakespeare_02_2.3.3.thumb.png b/website/static/samples/shakespeare_02_2.3.3.thumb.png
index a7c3c85..a7c3c85 100644..100755
--- a/website/static/samples/shakespeare_02_2.3.3.thumb.png
+++ b/website/static/samples/shakespeare_02_2.3.3.thumb.png
diff --git a/website/static/samples/shakespeare_03_2.3.3.png b/website/static/samples/shakespeare_03_2.3.3.png
index f45b706..f45b706 100644..100755
--- a/website/static/samples/shakespeare_03_2.3.3.png
+++ b/website/static/samples/shakespeare_03_2.3.3.png
diff --git a/website/static/samples/shakespeare_03_2.3.3.thumb.png b/website/static/samples/shakespeare_03_2.3.3.thumb.png
index 9233fb7..9233fb7 100644..100755
--- a/website/static/samples/shakespeare_03_2.3.3.thumb.png
+++ b/website/static/samples/shakespeare_03_2.3.3.thumb.png
diff --git a/website/static/samples/styled_01_1.6.png b/website/static/samples/styled_01_1.6.png
index 2b2a7fa..2b2a7fa 100644..100755
--- a/website/static/samples/styled_01_1.6.png
+++ b/website/static/samples/styled_01_1.6.png
diff --git a/website/static/samples/styled_01_1.6.thumb.png b/website/static/samples/styled_01_1.6.thumb.png
index fcbd32e..fcbd32e 100644..100755
--- a/website/static/samples/styled_01_1.6.thumb.png
+++ b/website/static/samples/styled_01_1.6.thumb.png
diff --git a/website/static/samples/styled_01_2.3.3.png b/website/static/samples/styled_01_2.3.3.png
index 9d8f650..9d8f650 100644..100755
--- a/website/static/samples/styled_01_2.3.3.png
+++ b/website/static/samples/styled_01_2.3.3.png
diff --git a/website/static/samples/styled_01_2.3.3.thumb.png b/website/static/samples/styled_01_2.3.3.thumb.png
index 05f5454..05f5454 100644..100755
--- a/website/static/samples/styled_01_2.3.3.thumb.png
+++ b/website/static/samples/styled_01_2.3.3.thumb.png
diff --git a/website/static/samples/styled_01_3.1.png b/website/static/samples/styled_01_3.1.png
index d826b06..d826b06 100644..100755
--- a/website/static/samples/styled_01_3.1.png
+++ b/website/static/samples/styled_01_3.1.png
diff --git a/website/static/samples/styled_01_3.1.thumb.png b/website/static/samples/styled_01_3.1.thumb.png
index 2985c4a..2985c4a 100644..100755
--- a/website/static/samples/styled_01_3.1.thumb.png
+++ b/website/static/samples/styled_01_3.1.thumb.png
diff --git a/website/static/samples/styled_02_1.6.png b/website/static/samples/styled_02_1.6.png
index 986ba04..986ba04 100644..100755
--- a/website/static/samples/styled_02_1.6.png
+++ b/website/static/samples/styled_02_1.6.png
diff --git a/website/static/samples/styled_02_1.6.thumb.png b/website/static/samples/styled_02_1.6.thumb.png
index f3db38d..f3db38d 100644..100755
--- a/website/static/samples/styled_02_1.6.thumb.png
+++ b/website/static/samples/styled_02_1.6.thumb.png
diff --git a/website/static/samples/styled_02_2.3.3.png b/website/static/samples/styled_02_2.3.3.png
index 15800ab..15800ab 100644..100755
--- a/website/static/samples/styled_02_2.3.3.png
+++ b/website/static/samples/styled_02_2.3.3.png
diff --git a/website/static/samples/styled_02_2.3.3.thumb.png b/website/static/samples/styled_02_2.3.3.thumb.png
index 36c1586..36c1586 100644..100755
--- a/website/static/samples/styled_02_2.3.3.thumb.png
+++ b/website/static/samples/styled_02_2.3.3.thumb.png
diff --git a/website/static/samples/styled_02_3.1.png b/website/static/samples/styled_02_3.1.png
index 6434b7b..6434b7b 100644..100755
--- a/website/static/samples/styled_02_3.1.png
+++ b/website/static/samples/styled_02_3.1.png
diff --git a/website/static/samples/styled_02_3.1.thumb.png b/website/static/samples/styled_02_3.1.thumb.png
index 1d2fd23..1d2fd23 100644..100755
--- a/website/static/samples/styled_02_3.1.thumb.png
+++ b/website/static/samples/styled_02_3.1.thumb.png
diff --git a/website/static/showdown.js b/website/static/showdown.js
index 6738a37..6738a37 100644..100755
--- a/website/static/showdown.js
+++ b/website/static/showdown.js
diff --git a/website/static/styles.css b/website/static/styles.css
index e3a0c37..e3a0c37 100644..100755
--- a/website/static/styles.css
+++ b/website/static/styles.css
diff --git a/website/support.html b/website/support.html
index 52e6c4a..2cfd25d 100644..100755
--- a/website/support.html
+++ b/website/support.html
@@ -10,9 +10,13 @@ layout: default
 		<p>Support for the implementation and development of ActionBarSherlock is available in the following places:</p>

 

 		<h3>Google Group</h3>

-		<p>Post a message to the Google Group for my personal projects. This will allow myself as well as other users of the library to assist you. It will also serve as a catalog of previous questions and announcements which may be useful.</p>

+		<p>Post a message to the Google Group about ActionBarSherlock. This will allow myself as well as other users of the library to assist you. It will also serve as a catalog of previous questions and announcements which may be useful. Please DO NOT post general questions about using the action bar APIs.</p>

 		<p class="link"><a href="https://groups.google.com/group/actionbarsherlock">groups.google.com/group/actionbarsherlock</a></p>

 

+		<h3>StackOverflow</h3>

+		<p>Like Google Groups, this will allow fellow users to assist you solve your problem. This is also a more approriate place to post general questions about the action bar API.</p>

+		<p class="link"><a href="http://stackoverflow.com/tags/actionbarsherlock">stackoverflow.com/tags/actionbarsherlock</a></p>

+

 		<h3>GitHub Issues</h3>

 		<p>If you have found a bug or want to suggest a new feature then you can create an issue on the GitHub project.</p>

 		<p class="link"><a href="https://github.com/JakeWharton/ActionBarSherlock/issues">github.com/JakeWharton/ActionBarSherlock/issues</a></p>

diff --git a/website/theming.html b/website/theming.html
index 95ff248..6da6c48 100644..100755
--- a/website/theming.html
+++ b/website/theming.html
@@ -29,19 +29,5 @@ layout: default
     &lt;item name="backgroundSplit">@drawable/bg_striped_split&lt;/item>

     &lt;item name="android:backgroundSplit">@drawable/bg_striped_split&lt;/item>

 &lt;/style></pre>

-

-		<h3>Dialog</h3>

-		<p>If you have a full activity that you wish to theme in the manner of a dialog there is also <code>Theme.Sherlock.Dialog</code> and <code>Theme.Sherlock.Light.Dialog</code> themes which will provide a consistent Ice Cream Sandwich look.</p>

-		<p>No additional dialog themes will be included. If you require some of the more advanced features of dialogs they must be implemented yourself.</p>

-

-		<h3>Extras</h3>

-		<p>There are also three additional themes built-in which will allow you to force the use of the overflow menu item on Android 2.x.</p>

-		<ul>

-			<li><code>Theme.Sherlock.ForceOverflow</code></li>

-			<li><code>Theme.Sherlock.Light.ForceOverflow</code></li>

-			<li><code>Theme.Sherlock.Light.DarkActionBar.ForceOverflow</code></li>

-		</ul>

-		<p>If you are using a custom theme you can also include the <code>absForceOverflow</code> attribute set to <code>true</code> rather than extend from one of the aforementioned themes.</p>

-		<p><strong>There is no way to control the presence of the overflow action item on Android 4.0 and newer. The force overflow will ONLY affect 2.x and 3.x.</strong></p>

 	</div>

 </div>

diff --git a/website/usage.html b/website/usage.html
index f3c3c91..e96cdc4 100644..100755
--- a/website/usage.html
+++ b/website/usage.html
@@ -4,11 +4,27 @@ layout: default
 ---

 

 

+<script type="text/javascript">

+$(function() {

+	$.getJSON('https://api.github.com/repos/JakeWharton/ActionBarSherlock/tags?callback=?', function(response) {

+		var meta = response.meta

+		  , data = response.data

+		;

+

+		data.sort(function(o1, o2) {

+			return (o1.name > o2.name) ? -1 : 1;

+		});

+

+		var last = data[0];

+		$('.latest-version').html(last.name);

+	});

+});

+</script>

+

 <div class="row">

 	<div class="three-fourths">

 		<h1>Usage</h1>

-		<p>Sticking with the theme of the official compatability library, ActionBarSherlock aims to allow the use of the action bar design pattern by mimicking the experience that would be found natively on Android Ice Cream Sandwich with as little effort as required.</p>

-		<p><strong>Are you migrating an application from version 3.x to 4.x?</strong> Check out the <a href="migration.html">migration guide</a> for detailed steps that will get your app up and running with the new version.</p>

+		<p>Sticking with the theme of the official compatibility library, ActionBarSherlock aims to allow the use of the action bar design pattern by mimicking the experience that would be found natively on Android Ice Cream Sandwich with as little effort as required.</p>

 

 		<h3>Requirements</h3>

 		<p>Due to its use of the native action bar and its related classes on Ice Cream Sandwich, the library requires that both it and your project are compiled with Android 4.0 or newer. The project also requires that you are compiling with JDK 1.6 in both your editor and any build systems that you may be using.</p>

@@ -17,15 +33,15 @@ layout: default
 		<h3>Including In Your Project</h3>

 		<p>There are a few ways to leverage ActionBarSherlock in your projects:</p>

 		<ol>

-			<li><p>If you’re using the <a href="http://www.eclipse.org/">Eclipse Development Environment</a> with the <a href="http://developer.android.com/sdk/eclipse-adt.html">ADT plugin</a> version 0.9.7 or greater you can include ActionBarSherlock as a library project. Create a new Android project in Eclipse using the <code>library/</code> folder as the existing source. Then, in your project properties, add the created project under the ‘Libraries’ section of the ‘Android’ category.</p></li>

-			<li><p>If you use <code>ant</code> to compile from the command line you will need to run <code>android update project -p .</code> inside the <code>library/</code> folder of the project. Once completed, you can reference the <code>library/</code> folder of ActionBarSherlock from your application's <code>project.properties</code> file. For more information please see the <a href="http://developer.android.com/guide/developing/projects/projects-cmdline.html#ReferencingLibraryProject">Android developer guide</a> for referencing library projects.</p></li>

+			<li><p>If you’re using the <a href="http://www.eclipse.org/">Eclipse Development Environment</a> with the <a href="http://developer.android.com/sdk/eclipse-adt.html">ADT plugin</a> version 0.9.7 or greater you can include ActionBarSherlock as a library project. Create a new Android project in Eclipse using the <code>actionbarsherlock/</code> folder as the existing source. Then, in your project properties, add the created project under the ‘Libraries’ section of the ‘Android’ category.</p></li>

+			<li><p>If you use <code>ant</code> to compile from the command line you will need to run <code>android update project -p .</code> inside the <code>actionbarsherlock/</code> folder of the project. Once completed, you can reference the <code>actionbarsherlock/</code> folder of ActionBarSherlock from your application's <code>project.properties</code> file. For more information please see the <a href="http://developer.android.com/guide/developing/projects/projects-cmdline.html#ReferencingLibraryProject">Android developer guide</a> for referencing library projects.</p></li>

 			<li>

 				<p>If you use maven to build your Android project you can simply add a dependency for this library.</p>

 				<code><pre>

 &lt;dependency>

   &lt;groupId>com.actionbarsherlock&lt;/groupId>

-  &lt;artifactId>library&lt;/artifactId>

-  &lt;version><span class="latest-version">4.0.0</span>&lt;/version>

+  &lt;artifactId>actionbarsherlock&lt;/artifactId>

+  &lt;version><span class="latest-version">4.1.0</span>&lt;/version>

   &lt;type>apklib&lt;/type>

 &lt;/dependency>

 </pre></code>

@@ -71,17 +87,17 @@ layout: default
 			<dt><a href="http://developer.android.com/reference/android/app/ActionBar.html">ActionBar</a></dt>

 			<dd>Main API for nearly all interaction with the action bar. <strong>This is the exact API <code>getSupportActionBar()</code> exposes.</strong></dd>

 			<dt><a href="http://developer.android.com/reference/android/app/Fragment.html">Fragment</a></dt>

-			<dd>New fundamental building block of layouts which enable your to provide rich experiences on a range of different devices without code duplication.</dd>

+			<dd>New fundamental building block of layouts which enable you to provide rich experiences on a range of different devices without code duplication.</dd>

 		</dl>

 

 		<h3>Articles</h3>

 		<dl>

 			<dt><a href="http://developer.android.com/guide/topics/ui/actionbar.html">Using the ActionBar</a></dt>

-			<dd>Broad introduction on the action bar design paradign, the API, and common use cases.</dd>

+			<dd>Broad introduction on the action bar design paradigm, the API, and common use cases.</dd>

 			<dt><a href="http://developer.android.com/guide/topics/ui/menus.html">Creating Menus</a></dt>

 			<dd>Menus drive the action bar's items.</dd>

-			<dt><a href="http://developer.android.com/sdk/compatibility-library.html#Using">Using the Compatability Libary</a></dt>

-			<dd>ActionBarSherlock is a superset of the official compatability library. All features in the Google library are also available for use through this library.</dd>

+			<dt><a href="http://developer.android.com/sdk/compatibility-library.html#Using">Using the Compatibility Libary</a></dt>

+			<dd>ActionBarSherlock is a superset of the official compatibility library. All features in the Google library are also available for use through this library.</dd>

 			<dt><a href="http://developer.android.com/guide/topics/fundamentals/fragments.html">Fragments</a></dt>

 			<dd>Introduction to utilizing this new modularized view and its lifecycle.</dd>

 		</dl>