Update ActionBarSherlock

5 files changed, 56 insertions, 3 deletions

diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
index 2497d24ff..03755be2b 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java
+++ b/APG/android-libs/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/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
index 9cb57e95a..7b4543640 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java
+++ b/APG/android-libs/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

diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
index 5cd13ba7c..3d092f033 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
+++ b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java
@@ -2,7 +2,7 @@ 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;
@@ -17,8 +17,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 {
+/** @see {@link android.support.v4.app.Watson} */
+public class SherlockFragmentActivity extends Watson implements OnActionModeStartedListener, OnActionModeFinishedListener {
     private static final boolean DEBUG = false;
     private static final String TAG = "SherlockFragmentActivity";
 
@@ -122,6 +122,17 @@ 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
diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
index 00c00fee5..aba6d85e8 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java
+++ b/APG/android-libs/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

diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
index 4f80be515..bee72cb25 100644
--- a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java
+++ b/APG/android-libs/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