summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ui
diff options
context:
space:
mode:
authorzhuw <zhuw@codeaurora.org>2018-04-23 09:33:17 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-04-22 18:53:52 -0700
commit453df37a71183f51100805538413b4db0440a1ef (patch)
tree43719a68855581ae70b0c1b1dd9bf0599b31b207 /src/com/android/gallery3d/ui
parentebfe1135a2159d3a2a16198045075deace1ea42a (diff)
downloadandroid_packages_apps_Gallery2-453df37a71183f51100805538413b4db0440a1ef.tar.gz
android_packages_apps_Gallery2-453df37a71183f51100805538413b4db0440a1ef.tar.bz2
android_packages_apps_Gallery2-453df37a71183f51100805538413b4db0440a1ef.zip
Fix focus close when Up event occurs before destroy
add null point filter Change-Id: I767ff9f9d493957c958d3b844f3c943b291c5cbb
Diffstat (limited to 'src/com/android/gallery3d/ui')
-rwxr-xr-xsrc/com/android/gallery3d/ui/PhotoView.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index c6d729159..e3b72eead 100755
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -1314,7 +1314,9 @@ public class PhotoView extends GLView {
if (mIgnoreSwipingGesture) return;
mHolding &= ~HOLD_TOUCH_DOWN;
- mEdgeView.onRelease();
+ if (mEdgeView != null) {
+ mEdgeView.onRelease();
+ }
// If we scrolled in Y direction far enough, treat it as a delete
// gesture.