diff options
| author | cretin45 <cretin45@gmail.com> | 2016-01-14 15:53:12 -0800 |
|---|---|---|
| committer | cretin45 <cretin45@gmail.com> | 2016-01-14 15:55:22 -0800 |
| commit | b87d6556eb28315fa4134c821787f46715b4083c (patch) | |
| tree | 8ac301d895b1a36aae2286af389cc060e69b7faa | |
| parent | c24eceab0838a6d24ff309ac1ad65b3628f04053 (diff) | |
| download | android_external_cyanogen_UICommon-b87d6556eb28315fa4134c821787f46715b4083c.tar.gz android_external_cyanogen_UICommon-b87d6556eb28315fa4134c821787f46715b4083c.tar.bz2 android_external_cyanogen_UICommon-b87d6556eb28315fa4134c821787f46715b4083c.zip | |
Add GalleryNext fixes to SlideUpPanelLayout
Change-Id: I707f168ab910e79bde2fd8327d3dbd801da556db
| -rw-r--r-- | src/com/cyngn/uicommon/view/SlidingUpPanelLayout.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/cyngn/uicommon/view/SlidingUpPanelLayout.java b/src/com/cyngn/uicommon/view/SlidingUpPanelLayout.java index 8b231bf..d5d5f90 100644 --- a/src/com/cyngn/uicommon/view/SlidingUpPanelLayout.java +++ b/src/com/cyngn/uicommon/view/SlidingUpPanelLayout.java @@ -29,8 +29,6 @@ import com.cyngn.uicommon.R; public class SlidingUpPanelLayout extends ViewGroup { - public static final int blah = 3; - private static final String TAG = SlidingUpPanelLayout.class.getSimpleName(); /** @@ -735,10 +733,14 @@ public class SlidingUpPanelLayout extends ViewGroup { break; } } + boolean interceptForDrag = false; + try { + interceptForDrag = mDragHelper.shouldInterceptTouchEvent(ev); + } catch (ArrayIndexOutOfBoundsException e) { + // Do nothing; + } - final boolean interceptForDrag = mDragHelper.shouldInterceptTouchEvent(ev); - - return interceptForDrag; + return interceptForDrag || interceptTap; } @Override |