From 7a8496e0644a6ee7631c8dd01448b1f0e0057aad Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Tue, 19 May 2015 20:00:04 +0200
Subject: [PATCH] Don't propagate image viewer touch events to the underlaying
 controller

---
 ...FrameLayout.java => TouchBlockingLinearLayout.java} | 10 +++++-----
 .../res/layout/controller_navigation_image_viewer.xml  |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename Clover/app/src/main/java/org/floens/chan/ui/view/{TouchBlockingFrameLayout.java => TouchBlockingLinearLayout.java} (78%)

diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingFrameLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingLinearLayout.java
similarity index 78%
rename from Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingFrameLayout.java
rename to Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingLinearLayout.java
index 5f08bacb..bb8288d4 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingFrameLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingLinearLayout.java
@@ -21,18 +21,18 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
-import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
-public class TouchBlockingFrameLayout extends FrameLayout {
-    public TouchBlockingFrameLayout(Context context) {
+public class TouchBlockingLinearLayout extends LinearLayout {
+    public TouchBlockingLinearLayout(Context context) {
         super(context);
     }
 
-    public TouchBlockingFrameLayout(Context context, AttributeSet attrs) {
+    public TouchBlockingLinearLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public TouchBlockingFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+    public TouchBlockingLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
     }
 
diff --git a/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml b/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml
index 8db44f0b..469042d6 100644
--- a/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml
+++ b/Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.floens.chan.ui.view.TouchBlockingLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_layout"
     android:layout_width="match_parent"
@@ -36,4 +36,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         android:layout_height="0dp"
         android:layout_weight="1" />
 
-</LinearLayout>
+</org.floens.chan.ui.view.TouchBlockingLinearLayout>