xml defined touch modes

Author: jfeinstein10

library/res/values/attrs.xml

@@ -21,9 +21,13 @@
         <attr name="viewBehind" format="reference" />
         <attr name="behindOffset" format="dimension" />
         <attr name="behindScrollScale" format="float" />
-        <attr name="behindSide">
-            <enum name="left" value="0" />
-            <enum name="right" value="1" />
+        <attr name="aboveTouchMode">
+            <enum name="margin" value="0" />
+            <enum name="fullscreen" value="1" />
+        </attr>
+        <attr name="behindTouchMode">
+            <enum name="margin" value="0" />
+            <enum name="fullscreen" value="1" />
         </attr>
     </declare-styleable>
 

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

@@ -9,8 +9,8 @@
 
 public class SlidingMenu extends RelativeLayout {
 
-	public static final int TOUCHMODE_FULLSCREEN = 0;
-	public static final int TOUCHMODE_MARGIN = 1;
+	public static final int TOUCHMODE_MARGIN = 0;
+	public static final int TOUCHMODE_FULLSCREEN = 1;
 
 	private CustomViewAbove mViewAbove;
 	private CustomViewBehind mViewBehind;
@@ -48,6 +48,10 @@ public SlidingMenu(Context context, AttributeSet attrs, int defStyle) {
 			View v = LayoutInflater.from(context).inflate(viewBehind, null);
 			setViewBehind(v);
 		}
+		int touchModeAbove = ta.getInt(R.styleable.SlidingMenu_aboveTouchMode, TOUCHMODE_MARGIN);
+		setTouchModeAbove(touchModeAbove);
+		int touchModeBehind = ta.getInt(R.styleable.SlidingMenu_behindTouchMode, TOUCHMODE_MARGIN);
+		setTouchModeBehind(touchModeBehind);
 		// set the offset and scroll scale if defined in xml
 		int offsetBehind = (int) ta.getDimension(R.styleable.SlidingMenu_behindOffset, 0);
 		setBehindOffset(offsetBehind);
@@ -166,23 +170,23 @@ public void setBehindScrollScale(float f) {
 		mViewAbove.setScrollScale(f);
 	}
 
-	public int getAboveTouchMode() {
+	public int getTouchModeAbove() {
 		return mViewAbove.getAboveTouchMode();
 	}
 
-	public void setAboveTouchMode(int i) {
+	public void setTouchModeAbove(int i) {
 		if (i != TOUCHMODE_FULLSCREEN && i != TOUCHMODE_MARGIN) {
 			throw new IllegalStateException("TouchMode must be set to either" +
 					"TOUCHMODE_FULLSCREEN or TOUCHMODE_MARGIN.");
 		}
 		mViewAbove.setAboveTouchMode(i);
 	}
 
-	public int getBehindTouchMode() {
+	public int getTouchModeBehind() {
 		return mViewAbove.getBehindTouchMode();
 	}
 
-	public void setBehindTouchMode(int i) {
+	public void setTouchModeBehind(int i) {
 		if (i != TOUCHMODE_FULLSCREEN && i != TOUCHMODE_MARGIN) {
 			throw new IllegalStateException("TouchMode must be set to either" +
 					"TOUCHMODE_FULLSCREEN or TOUCHMODE_MARGIN.");