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

Merge "Fix selecting with touch in multi-window." into nyc-dev

Browse Source 
am: fbd4b55

* commit 'fbd4b558d5630c83f5bb820328bb606a89b68577':
  Fix selecting with touch in multi-window.

Change-Id: I99e3ee0bd9cf5b53533ef841ed61691cda9d940f
This commit is contained in:
Tomasz Mikolajewski
2016-04-12 01:19:27 +00:00
committed by android-build-merger
parent cda996cff8 fbd4b558d5
commit 8d17c6f28f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/DocumentsUI/src/com/android/documentsui/dirlist/DocumentHolder.java
View File

@@ -139,11 +139,13 @@ public abstract class DocumentHolder
} }
// Do everything in global coordinates - it makes things simpler. // Do everything in global coordinates - it makes things simpler.
Rect rect = new Rect(); int[] coords = new int[2];
mSelectionHotspot.getGlobalVisibleRect(rect); mSelectionHotspot.getLocationOnScreen(coords);
Rect rect = new Rect(coords[0], coords[1], coords[0] + mSelectionHotspot.getWidth(),
coords[1] + mSelectionHotspot.getHeight());
// If the tap occurred within the icon rect, consider it a selection. // If the tap occurred within the icon rect, consider it a selection.
if (rect.contains((int)event.getRawX(), (int)event.getRawY())) { if (rect.contains((int) event.getRawX(), (int) event.getRawY())) {
return mEventListener.onSelect(this); return mEventListener.onSelect(this);
} else { } else {
return mEventListener.onActivate(this); return mEventListener.onActivate(this);