Update actionbarsherlock from 4.2 to 4.4

1 files changed, 16 insertions, 10 deletions

diff --git a/libraries/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
index ab160f836..2c0312725 100644
--- a/libraries/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java
+++ b/libraries/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,7 @@ import com.actionbarsherlock.view.MenuItem;
  */

 public abstract class ActionBarSherlock {

     protected static final String TAG = "ActionBarSherlock";

-    protected static final boolean DEBUG = false;

+    public 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 =

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

      */

     public abstract ActionMode startActionMode(ActionMode.Callback callback);

+

+    /**

+     * Ensure that the action bar is attached.

+     */

+    public void ensureActionBar() {}

 }