Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reset pointer icon when view is not present" into nyc-dev

Browse Source 
am: 6cf85afcb1

* commit '6cf85afcb1e0e410e8e168c999e40fad3797d6ab':
  Reset pointer icon when view is not present
This commit is contained in:
Andrii Kulian
2016-02-29 21:39:34 +00:00
committed by android-build-merger
parent 1bfce67fd4 6cf85afcb1
commit 3737049fa7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/ViewRootImpl.java
View File

@@ -4398,8 +4398,14 @@ public final class ViewRootImpl implements ViewParent,
private boolean updatePointerIcon(MotionEvent event) {
final float x = event.getX();
final float y = event.getY();
if (mView == null) {
// E.g. click outside a popup to dismiss it
Slog.d(mTag, "updatePointerIcon called after view was removed");
return false;
}
if (x < 0 || x >= mView.getWidth() || y < 0 || y >= mView.getHeight()) {
Slog.e(mTag, "updatePointerIcon called with position out of bounds");
// E.g. when moving window divider with mouse
Slog.d(mTag, "updatePointerIcon called with position out of bounds");
return false;
}
final PointerIcon pointerIcon = mView.getPointerIcon(event, x, y);