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

Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev

Browse Source
This commit is contained in:
Rob Carr
2016-04-27 00:29:58 +00:00
committed by Android (Google) Code Review
parent 49d7803f04 9e76d3292b
commit 4f40766360
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -364,8 +364,8 @@ class DisplayContent {
final ArrayList<Task> tasks = stack.getTasks();
for (int taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) {
final Task task = tasks.get(taskNdx);
final WindowState win = task.getTopVisibleAppMainWindow();
if (win == null) {
AppWindowToken token = task.getTopVisibleAppToken();
if (token == null || !token.isVisible()) {
continue;
}
@@ -375,20 +375,18 @@ class DisplayContent {
* We also remove the outside touch area for resizing for all freeform
* tasks (including the focused).
*
* (For freeform focused task, the below logic will first remove the enlarged
* area, then add back the inner area.)
* We save the focused task region once we find it, and add it back at the end.
*/
if (task == focusedTask) {
addBackFocusedTask = true;
mTmpRect2.set(mTmpRect);
}
final boolean isFreeformed = task.inFreeformWorkspace();
if (task != focusedTask || isFreeformed) {
task.getDimBounds(mTmpRect);
if (isFreeformed) {
// If we're removing a freeform, focused app from the exclusion region,
// we need to add back its touchable frame later. Remember the touchable
// frame now.
if (task == focusedTask) {
addBackFocusedTask = true;
mTmpRect2.set(mTmpRect);
}
// If the task is freeformed, enlarge the area to account for outside
// touch area for resize.
mTmpRect.inset(-delta, -delta);