jenkins-bot has submitted this change and it was merged. Change subject: Hygiene: remove FixedViewPager workaround ......................................................................
Hygiene: remove FixedViewPager workaround We don't think the bug[0] this workaround hid is occurring any more, probably due to Fresco. Remove the workaround. [0] https://github.com/chrisbanes/PhotoView/issues/206 Change-Id: I798b80eff5c203d59769810fafefef45d0249049 --- D app/src/main/java/android/support/v4/view/FixedViewPager.java M app/src/main/res/layout/activity_gallery.xml 2 files changed, 1 insertion(+), 36 deletions(-) Approvals: 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 deleted file mode 100644 index 76ed434..0000000 --- a/app/src/main/java/android/support/v4/view/FixedViewPager.java +++ /dev/null @@ -1,35 +0,0 @@ -package android.support.v4.view; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.MotionEvent; - -import org.wikipedia.util.log.L; - -/** - * 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) { - L.logRemoteErrorIfProd(e); - return false; - } - } -} diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml index b977886..2ca1f09 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.FixedViewPager + <android.support.v4.view.ViewPager android:id="@+id/gallery_item_pager" android:layout_width="match_parent" android:layout_height="match_parent"/> -- To view, visit https://gerrit.wikimedia.org/r/278297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I798b80eff5c203d59769810fafefef45d0249049 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
