jenkins-bot has submitted this change and it was merged. Change subject: Restore FixedViewPager ......................................................................
Restore FixedViewPager Revert FixedViewPager removal in 3fc5c0a. Bug: T116384 Change-Id: I7c4a207288a0f227150f82e902a01fad3483ff16 --- A app/src/main/java/android/support/v4/view/FixedViewPager.java M app/src/main/res/layout/activity_gallery.xml 2 files changed, 33 insertions(+), 1 deletion(-) Approvals: Mholloway: Looks good to me, but someone else must approve Dbrant: Looks good to me, approved jenkins-bot: Verified diff --git a/app/src/main/java/android/support/v4/view/FixedViewPager.java b/app/src/main/java/android/support/v4/view/FixedViewPager.java new file mode 100644 index 0000000..5bc77ba --- /dev/null +++ b/app/src/main/java/android/support/v4/view/FixedViewPager.java @@ -0,0 +1,32 @@ +package android.support.v4.view; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; + +/** + * TODO: Remove this class when the Support library and/or PhotoView is updated. + * This solves an intermittent crash when using ViewPager with the PhotoView component. + * + * https://code.google.com/p/android/issues/detail?id=18990 + * https://github.com/chrisbanes/PhotoView/issues/206 + * + */ +public class FixedViewPager extends ViewPager { + public FixedViewPager(Context context) { + super(context); + } + + public FixedViewPager(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + try { + return super.onInterceptTouchEvent(ev); + } catch (IllegalArgumentException e) { + return false; + } + } +} diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml index 2ca1f09..b977886 100644 --- a/app/src/main/res/layout/activity_gallery.xml +++ b/app/src/main/res/layout/activity_gallery.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:background="@color/gallery_background"> - <android.support.v4.view.ViewPager + <android.support.v4.view.FixedViewPager android:id="@+id/gallery_item_pager" android:layout_width="match_parent" android:layout_height="match_parent"/> -- To view, visit https://gerrit.wikimedia.org/r/248349 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c4a207288a0f227150f82e902a01fad3483ff16 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <[email protected]> Gerrit-Reviewer: BearND <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Dbrant <[email protected]> Gerrit-Reviewer: Mholloway <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
