Merge branch 'master' of https://github.com/jfeinstein10/SlidingMenu

Author: jfeinstein10

README.md

@@ -39,17 +39,24 @@ If you decide to use SlidingMenu as a view, you can define it in your xml layout
     android:layout_height="fill_parent"
     sliding:viewAbove="@layout/YOUR_ABOVE_VIEW"
     sliding:viewBehind="@layout/YOUR_BEHIND_BEHIND"
+    sliding:touchModeAbove="margin|fullscreen"
+    sliding:touchModeBehind="margin|fullscreen"
     sliding:behindOffset="@dimen/YOUR_OFFSET"
-    sliding:behindScrollScale="@dimen/YOUR_SCALE" />
+    sliding:behindScrollScale="@dimen/YOUR_SCALE"/>
 ```
 * `viewAbove` - a reference to the layout that you want to use as the above view of the SlidingMenu
 * `viewBehind` - a reference to the layout that you want to use as the behind view of the SlidingMenu
+* `touchModeAbove` - an enum that designates what part of the screen is touchable when the above view is 
+showing. Margin means only the left margin. Fullscreen means the entire screen. Default is margin.
+* `touchModeBehind` - an enum that designates what part of the screen is touchable when the behind view
+is showing. Margin means only what is showing of the above view. Fullscreen means the entire screen.
+Default is margin.
 * `behindOffset` - a dimension representing the number of pixels that you want the above view to show when the
-behind view is showing
+behind view is showing. Default is 0.
 * `behindScrollScale` - a float representing the relationship between the above view scrolling and the behind
 behind view scrolling. If set to 0.5f, the behind view will scroll 1px for every 2px that the above view scrolls.
 If set to 1.0f, the behind view will scroll 1px for every 1px that the above view scrolls. And if set to 0.0f, the
-behind view will never scroll; it will be static. This one is fun to play around with.
+behind view will never scroll; it will be static. This one is fun to play around with. Default is 0.
 
 Developed By
 ------------