Fix for empty non-clickable views

Author: jfeinstein10

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

@@ -34,7 +34,7 @@
 public class CustomViewAbove extends ViewGroup {
 
 	private static final String TAG = "CustomViewAbove";
-	private static final boolean DEBUG = true;
+	private static final boolean DEBUG = false;
 
 	private static final boolean USE_CACHE = false;
 
@@ -158,11 +158,9 @@ public CustomViewAbove(Context context, AttributeSet attrs) {
 	}
 
 	void initCustomViewAbove() {
-//		setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
-		setDescendantFocusability(FOCUS_BEFORE_DESCENDANTS);
-		setClickable(true);
-		setFocusable(true);
 		setWillNotDraw(false);
+		setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
+		setFocusable(true);
 		final Context context = getContext();
 		mScroller = new Scroller(context, sInterpolator);
 		final ViewConfiguration configuration = ViewConfiguration.get(context);
@@ -435,8 +433,6 @@ public void setContent(View v) {
 		if (mContent != null) 
 			this.removeView(mContent);
 		mContent = v;
-//		mContent.setClickable(true);
-		mContent.setFocusable(true);
 		addView(mContent);
 	}
 
@@ -689,12 +685,12 @@ public boolean onTouchEvent(MotionEvent ev) {
 		if (!mEnabled)
 			return false;
 
-		//		if (!mIsBeingDragged && !thisTouchAllowed(ev))
-		//			return false;
-
-		if (!mIsBeingDragged && !mQuickReturn)
+		if (!mIsBeingDragged && !thisTouchAllowed(ev))
 			return false;
 
+		//		if (!mIsBeingDragged && !mQuickReturn)
+		//			return false;
+
 		final int action = ev.getAction();
 
 		if (mVelocityTracker == null) {

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

@@ -199,7 +199,7 @@ public SlidingMenu(Context context, AttributeSet attrs) {
 	 */
 	public SlidingMenu(Context context, AttributeSet attrs, int defStyle) {
 		super(context, attrs, defStyle);
-
+		
 		LayoutParams behindParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
 		mViewBehind = new CustomViewBehind(context);
 		addView(mViewBehind, behindParams);
@@ -320,10 +320,13 @@ public void attachToActivity(Activity activity, int slideStyle, boolean actionba
 		case SLIDING_CONTENT:
 			mActionbarOverlay = actionbarOverlay;
 			// take the above view out of
-			ViewGroup contentParent = (ViewGroup)activity.findViewById(android.R.id.content);
-			View content = contentParent.getChildAt(0);
+//			ViewGroup contentParent = (ViewGroup)activity.findViewById(android.R.id.content);
+//			View content = contentParent.getChildAt(0);
+			View content = activity.findViewById(android.R.id.content);
+			content.setFocusable(true);
+			ViewGroup contentParent = (ViewGroup)content.getParent();
 			contentParent.removeView(content);
-			contentParent.addView(this, 0, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+			contentParent.addView(this);
 			setContent(content);
 			// save people from having transparent backgrounds
 			if (content.getBackground() == null)