Don't propagate image viewer touch events to the underlaying controller

filtering
Floens 10 years ago
parent e599b1313c
commit 7a8496e064
  1. 10
      Clover/app/src/main/java/org/floens/chan/ui/view/TouchBlockingLinearLayout.java
  2. 4
      Clover/app/src/main/res/layout/controller_navigation_image_viewer.xml

@ -21,18 +21,18 @@ import android.content.Context;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.widget.FrameLayout; import android.widget.LinearLayout;
public class TouchBlockingFrameLayout extends FrameLayout { public class TouchBlockingLinearLayout extends LinearLayout {
public TouchBlockingFrameLayout(Context context) { public TouchBlockingLinearLayout(Context context) {
super(context); super(context);
} }
public TouchBlockingFrameLayout(Context context, AttributeSet attrs) { public TouchBlockingLinearLayout(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
} }
public TouchBlockingFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) { public TouchBlockingLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
} }

@ -15,7 +15,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. 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" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/root_layout" android:id="@+id/root_layout"
android:layout_width="match_parent" 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_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </org.floens.chan.ui.view.TouchBlockingLinearLayout>

Loading…
Cancel
Save