Tricking ActionBarSherlock. No longer need my custom installDecor method exposed.

Author: jfeinstein10

library/src/com/slidingmenu/lib/app/SlidingActivity.java

@@ -9,15 +9,14 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.actionbarsherlock.ActionBarSherlockCompat;
 import com.actionbarsherlock.app.SherlockActivity;
 import com.slidingmenu.lib.R;
 import com.slidingmenu.lib.SlidingMenu;
@@ -26,6 +25,7 @@ public class SlidingActivity extends SherlockActivity implements SlidingActivity
 
 	private SlidingMenu mSlidingMenu;
 	private View mMainLayout;
+	private WindowHelper mWindowHelper;
 	private boolean mContentViewCalled = true;
 	private boolean mBehindContentViewCalled = true;
 	private SlidingMenuList mMenuList;
@@ -34,10 +34,8 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		super.setContentView(R.layout.slidingmenumain);
 		mSlidingMenu = (SlidingMenu) super.findViewById(R.id.slidingmenulayout);
+		mWindowHelper = new WindowHelper(this, super.getWindow(), mSlidingMenu);
 		// generate the ActionBar inside an arbitrary RelativeLayout
-		RelativeLayout mainView = new RelativeLayout(this);
-		((ActionBarSherlockCompat)getSherlock()).installDecor(mainView);
-		mSlidingMenu.setViewAbove(mainView);
 		mMainLayout = super.findViewById(R.id.slidingmenulayout);
 	}
 
@@ -49,8 +47,11 @@ public void onPostCreate(Bundle savedInstanceState) {
 		}
 		mSlidingMenu.setStatic(isStatic());
 	}
+	
+	public Window getWindow() {
+		return mWindowHelper;
+	}
 
-	@Override
 	public void setContentView(int id) {
 		setContentView(getLayoutInflater().inflate(id, null));
 	}

library/src/com/slidingmenu/lib/app/SlidingActivityBase.java

@@ -10,9 +10,7 @@ public interface SlidingActivityBase {
 	public void setBehindContentView(View v, LayoutParams p);
 
 	public SlidingMenu getSlidingMenu();
-	
-	boolean isStatic();
-	
+		
 	public void toggle();
 
 	public void showAbove();

library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java

@@ -9,36 +9,37 @@
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.actionbarsherlock.ActionBarSherlockCompat;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.slidingmenu.lib.R;
 import com.slidingmenu.lib.SlidingMenu;
 
 public class SlidingFragmentActivity extends SherlockFragmentActivity implements SlidingActivityBase {
 
 	private SlidingMenu mSlidingMenu;
-	private View mMainLayout;
+	private ViewGroup mContentView;
 	private boolean mContentViewCalled = true;
 	private boolean mBehindContentViewCalled = true;
 	private SlidingMenuList mMenuList;
 
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		super.setContentView(R.layout.slidingmenumain);
-		mSlidingMenu = (SlidingMenu) super.findViewById(R.id.slidingmenulayout);
-		// generate the ActionBar inside an arbitrary RelativeLayout
-		RelativeLayout mainView = new RelativeLayout(this);
-		((ActionBarSherlockCompat)getSherlock()).installDecor(mainView);
-		mSlidingMenu.setViewAbove(mainView);
-		mMainLayout = super.findViewById(R.id.slidingmenulayout);
+		// unregister the current content view
+		getWindow().getDecorView().findViewById(android.R.id.content).setId(View.NO_ID);
+		// register a new content view
+		mContentView = new RelativeLayout(this);
+		mContentView.setId(android.R.id.content);
+		// set up the SlidingMenu
+		mSlidingMenu = (SlidingMenu) getLayoutInflater().inflate(R.layout.slidingmenumain, null);
+		mSlidingMenu.setViewAbove(mContentView);
+		super.setContentView(mSlidingMenu);
 	}
 
 	public void onPostCreate(Bundle savedInstanceState) {
@@ -47,9 +48,20 @@ public void onPostCreate(Bundle savedInstanceState) {
 			throw new IllegalStateException("Both setContentView and " +
 					"setBehindContentView must be called in onCreate.");
 		}
-		mSlidingMenu.setStatic(isStatic());
 	}
 
+//	public Window getWindow() {
+//		if (mWindowHelper == null) {
+//			return super.getWindow();
+//		} else {
+//			return mWindowHelper;
+//		}
+//	}
+//
+//	private Window getWindowInternal() {
+//		return super.getWindow();
+//	}
+
 	@Override
 	public void setContentView(int id) {
 		setContentView(getLayoutInflater().inflate(id, null));
@@ -63,7 +75,7 @@ public void setContentView(View v, LayoutParams params) {
 		if (!mContentViewCalled) {
 			mContentViewCalled = true;
 		}
-		getSherlock().setContentView(v);
+		mContentView.addView(v);
 	}
 
 	public void setBehindContentView(int id) {
@@ -81,10 +93,6 @@ public void setBehindContentView(View v, LayoutParams params) {
 		mSlidingMenu.setViewBehind(v);
 	}
 
-	public boolean isStatic() {
-		return mMainLayout instanceof LinearLayout;
-	}
-	
 	public SlidingMenu getSlidingMenu() {
 		return mSlidingMenu;
 	}
@@ -104,12 +112,10 @@ public void toggle() {
 	}
 
 	public void showAbove() {
-		if (isStatic()) return;
 		mSlidingMenu.showAbove();
 	}
 
 	public void showBehind() {
-		if (isStatic()) return;
 		mSlidingMenu.showBehind();
 	}
 

library/src/com/slidingmenu/lib/app/SlidingListActivity.java

@@ -17,7 +17,6 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.actionbarsherlock.ActionBarSherlockCompat;
 import com.actionbarsherlock.app.SherlockListActivity;
 import com.slidingmenu.lib.R;
 import com.slidingmenu.lib.SlidingMenu;
@@ -38,7 +37,7 @@ public void onCreate(Bundle savedInstanceState) {
 		mSlidingMenu = (SlidingMenu) super.findViewById(R.id.slidingmenulayout);
 		// generate the ActionBar inside an arbitrary RelativeLayout
 		RelativeLayout mainView = new RelativeLayout(this);
-		((ActionBarSherlockCompat)getSherlock()).installDecor(mainView);
+//		((ActionBarSherlockCompat)getSherlock()).installDecor(mainView);
 		mSlidingMenu.setViewAbove(mainView);
 		mMainLayout = super.findViewById(R.id.slidingmenulayout);
 	}