Merge "Reject all touch events in TouchBlockingFrameLayout"

src/com/android/settings/TouchBlockingFrameLayout.java

@@ -31,12 +31,7 @@ public class TouchBlockingFrameLayout extends FrameLayout {
     }
 
     @Override
-    public boolean onInterceptTouchEvent(MotionEvent ev) {
+    public boolean dispatchTouchEvent(MotionEvent ev) {
-        return true;
+        return false;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        return true;
     }
 }