Renaming behind to menu and above to content

example/project.properties

@@ -11,8 +11,8 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:16
+target=android-17
 android.library=false
 android.library.reference.1=../library
 android.library.reference.2=../ABS
-proguard.config=proguard-project.txt
+proguard.config=proguard-project.txt

example/src/com/slidingmenu/example/fragments/FragmentChangeActivity.java

@@ -54,7 +54,7 @@ public void switchContent(Fragment fragment) {
 		.beginTransaction()
 		.replace(R.id.content_frame, fragment)
 		.commit();
-		getSlidingMenu().showAbove();
+		getSlidingMenu().showContent();
 	}
 
 }

example/src/com/slidingmenu/example/fragments/ResponsiveUIActivity.java

@@ -105,7 +105,7 @@ public void switchContent(final Fragment fragment) {
 		Handler h = new Handler();
 		h.postDelayed(new Runnable() {
 			public void run() {
-				getSlidingMenu().showAbove();
+				getSlidingMenu().showContent();
 			}
 		}, 50);
 	}	

library/src/com/slidingmenu/lib/SlidingMenu.java

@@ -309,7 +309,7 @@ public void setContent(int res) {
 	public void setContent(View view) {
 		mViewAbove.setContent(view);
 		mViewAbove.invalidate();
-		showAbove();
+		showContent();
 	}
 
 	/**
@@ -433,34 +433,52 @@ public void setStatic(boolean b) {
 	}
 
 	/**
-	 * Opens the menu and shows the behind view.
+	 * Opens the menu and shows the menu view.
 	 */
-	public void showBehind() {
-		showBehind(true);
+	public void showMenu() {
+		showMenu(true);
 	}
 
 	/**
-	 * Opens the menu and shows the behind view.
+	 * Opens the menu and shows the menu view.
 	 *
 	 * @param animate true to animate the transition, false to ignore animation
 	 */
-	public void showBehind(boolean animate) {
+	public void showMenu(boolean animate) {
 		mViewAbove.setCurrentItem(0, animate);
 	}
+
+	/**
+	 * Opens the menu and shows the secondary menu view. Will default to the regular menu
+	 * if there is only one.
+	 */
+	public void showSecondaryMenu() {
+		showSecondaryMenu(true);
+	}
+
+	/**
+	 * Opens the menu and shows the secondary (right) menu view. Will default to the regular menu
+	 * if there is only one.
+	 *
+	 * @param animate true to animate the transition, false to ignore animation
+	 */
+	public void showSecondaryMenu(boolean animate) {
+		mViewAbove.setCurrentItem(2, animate);
+	}
 
 	/**
 	 * Closes the menu and shows the above view.
 	 */
-	public void showAbove() {
-		showAbove(true);
+	public void showContent() {
+		showContent(true);
 	}
 
 	/**
 	 * Closes the menu and shows the above view.
 	 *
 	 * @param animate true to animate the transition, false to ignore animation
 	 */
-	public void showAbove(boolean animate) {
+	public void showContent(boolean animate) {
 		mViewAbove.setCurrentItem(1, animate);
 	}
 
@@ -477,10 +495,10 @@ public void toggle() {
 	 * @param animate true to animate the transition, false to ignore animation
 	 */
 	public void toggle(boolean animate) {
-		if (isBehindShowing()) {
-			showAbove(animate);
+		if (isMenuShowing()) {
+			showContent(animate);
 		} else {
-			showBehind(animate);
+			showMenu(animate);
 		}
 	}
 
@@ -489,7 +507,7 @@ public void toggle(boolean animate) {
 	 *
 	 * @return Whether or not the behind view is showing
 	 */
-	public boolean isBehindShowing() {
+	public boolean isMenuShowing() {
 		return mViewAbove.getCurrentItem() == 0 || mViewAbove.getCurrentItem() == 2;
 	}
 
@@ -810,7 +828,7 @@ private SavedState(Parcel in) {
 	@Override
 	protected Parcelable onSaveInstanceState() {
 		Parcelable superState = super.onSaveInstanceState();
-		SavedState ss = new SavedState(superState, isBehindShowing());
+		SavedState ss = new SavedState(superState, isMenuShowing());
 		return ss;
 	}
 
@@ -828,9 +846,9 @@ protected void onRestoreInstanceState(Parcelable state) {
 		super.onRestoreInstanceState(ss.getSuperState());
 
 		if (ss.mBehindShowing) {
-			showBehind();
+			showMenu();
 		} else {
-			showAbove();
+			showContent();
 		}
 	}
 

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

@@ -114,15 +114,22 @@ public void toggle() {
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove()
 	 */
-	public void showAbove() {
-		mHelper.showAbove();
+	public void showContent() {
+		mHelper.showContent();
 	}
 
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind()
 	 */
-	public void showBehind() {
-		mHelper.showBehind();
+	public void showMenu() {
+		mHelper.showMenu();
+	}
+
+	/* (non-Javadoc)
+	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu()
+	 */
+	public void showSecondaryMenu() {
+		mHelper.showSecondaryMenu();
 	}
 
 	/* (non-Javadoc)

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

@@ -47,14 +47,20 @@ public interface SlidingActivityBase {
 	public void toggle();
 
 	/**
-	 * Close the SlidingMenu and show the above view.
+	 * Close the SlidingMenu and show the content view.
 	 */
-	public void showAbove();
+	public void showContent();
 
 	/**
-	 * Open the SlidingMenu and show the behind view.
+	 * Open the SlidingMenu and show the menu view.
 	 */
-	public void showBehind();
+	public void showMenu();
+
+	/**
+	 * Open the SlidingMenu and show the secondary (right) menu view. Will default to the regular menu
+	 * if there is only one.
+	 */
+	public void showSecondaryMenu();
 
 	/**
 	 * Controls whether the ActionBar slides along with the above view when the menu is opened,

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

@@ -86,7 +86,7 @@ public void onPostCreate(Bundle savedInstanceState) {
 			mSlidingMenu.setContent(mViewAbove);
 			parent.addView(mSlidingMenu, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
 		}
-		this.showAbove();
+		this.showContent();
 	}
 
 	/**
@@ -126,7 +126,7 @@ public View findViewById(int id) {
 	 * @param outState Bundle in which to place your saved state.
 	 */
 	public void onSaveInstanceState(Bundle outState) {
-		outState.putBoolean("menuOpen", mSlidingMenu.isBehindShowing());
+		outState.putBoolean("menuOpen", mSlidingMenu.isMenuShowing());
 	}
 
 	/**
@@ -179,25 +179,29 @@ public SlidingMenu getSlidingMenu() {
 	 * Toggle the SlidingMenu. If it is open, it will be closed, and vice versa.
 	 */
 	public void toggle() {
-		if (mSlidingMenu.isBehindShowing()) {
-			showAbove();
-		} else {
-			showBehind();
-		}
+		mSlidingMenu.toggle();
 	}
 
 	/**
-	 * Close the SlidingMenu and show the above view.
+	 * Close the SlidingMenu and show the content view.
 	 */
-	public void showAbove() {
-		mSlidingMenu.showAbove();
+	public void showContent() {
+		mSlidingMenu.showContent();
 	}
 
 	/**
-	 * Open the SlidingMenu and show the behind view.
+	 * Open the SlidingMenu and show the menu view.
+	 */
+	public void showMenu() {
+		mSlidingMenu.showMenu();
+	}
+
+	/**
+	 * Open the SlidingMenu and show the secondary menu view. Will default to the regular menu
+	 * if there is only one.
 	 */
-	public void showBehind() {
-		mSlidingMenu.showBehind();
+	public void showSecondaryMenu() {
+		mSlidingMenu.showSecondaryMenu();
 	}
 
 	/**
@@ -208,8 +212,8 @@ public void showBehind() {
 	 * @return true, if successful
 	 */
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_BACK && mSlidingMenu.isBehindShowing()) {
-			showAbove();
+		if (keyCode == KeyEvent.KEYCODE_BACK && mSlidingMenu.isMenuShowing()) {
+			showContent();
 			return true;
 		}
 		return false;

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

@@ -114,15 +114,22 @@ public void toggle() {
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove()
 	 */
-	public void showAbove() {
-		mHelper.showAbove();
+	public void showContent() {
+		mHelper.showContent();
 	}
 
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind()
 	 */
-	public void showBehind() {
-		mHelper.showBehind();
+	public void showMenu() {
+		mHelper.showMenu();
+	}
+
+	/* (non-Javadoc)
+	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu()
+	 */
+	public void showSecondaryMenu() {
+		mHelper.showSecondaryMenu();
 	}
 
 	/* (non-Javadoc)

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

@@ -118,15 +118,23 @@ public void toggle() {
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove()
 	 */
-	public void showAbove() {
-		mHelper.showAbove();
+	public void showContent() {
+		mHelper.showContent();
 	}
 
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind()
 	 */
-	public void showBehind() {
-		mHelper.showBehind();
+	public void showMenu() {
+		mHelper.showMenu();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu()
+	 */
+	public void showSecondaryMenu() {
+		mHelper.showSecondaryMenu();
 	}
 
 	/* (non-Javadoc)

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

@@ -114,15 +114,22 @@ public void toggle() {
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove()
 	 */
-	public void showAbove() {
-		mHelper.showAbove();
+	public void showContent() {
+		mHelper.showContent();
 	}
 
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind()
 	 */
-	public void showBehind() {
-		mHelper.showBehind();
+	public void showMenu() {
+		mHelper.showMenu();
+	}
+
+	/* (non-Javadoc)
+	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu()
+	 */
+	public void showSecondaryMenu() {
+		mHelper.showSecondaryMenu();
 	}
 
 	/* (non-Javadoc)

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

@@ -114,15 +114,22 @@ public void toggle() {
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove()
 	 */
-	public void showAbove() {
-		mHelper.showAbove();
+	public void showContent() {
+		mHelper.showContent();
 	}
 
 	/* (non-Javadoc)
 	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind()
 	 */
-	public void showBehind() {
-		mHelper.showBehind();
+	public void showMenu() {
+		mHelper.showMenu();
+	}
+
+	/* (non-Javadoc)
+	 * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu()
+	 */
+	public void showSecondaryMenu() {
+		mHelper.showSecondaryMenu();
 	}
 
 	/* (non-Javadoc)