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

Merge "Fixed issue with ordering of non-app token windows"

Browse Source
This commit is contained in:
Wale Ogunwale
2016-12-13 22:43:29 +00:00
committed by Android (Google) Code Review
parent b8eac24ff2 6ce0fb8ddb
commit 162ea7f014
8 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
View File

@@ -13,6 +13,7 @@ import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.PixelFormat;
import android.os.AsyncTask;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
@@ -155,6 +156,7 @@ public class AssistManager {
| WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
| WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
PixelFormat.TRANSLUCENT);
lp.token = new Binder();
if (ActivityManager.isHighEndGfx()) {
lp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
}

2
packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java
View File

@@ -27,6 +27,7 @@ import android.content.res.Configuration;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.os.Binder;
import android.os.RemoteException;
import android.util.DisplayMetrics;
import android.view.Gravity;
@@ -106,6 +107,7 @@ public class ScreenPinningRequest implements View.OnClickListener {
| WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED
,
PixelFormat.TRANSLUCENT);
lp.token = new Binder();
lp.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
lp.setTitle("ScreenPinningConfirmation");
lp.gravity = Gravity.FILL;

2
packages/SystemUI/src/com/android/systemui/stackdivider/DividerWindowManager.java
View File

@@ -18,6 +18,7 @@ package com.android.systemui.stackdivider;
import android.content.Context;
import android.graphics.PixelFormat;
import android.os.Binder;
import android.view.View;
import android.view.WindowManager;
@@ -51,6 +52,7 @@ public class DividerWindowManager {
FLAG_NOT_FOCUSABLE | FLAG_NOT_TOUCH_MODAL
| FLAG_WATCH_OUTSIDE_TOUCH | FLAG_SPLIT_TOUCH | FLAG_SLIPPERY,
PixelFormat.TRANSLUCENT);
mLp.token = new Binder();
mLp.setTitle(WINDOW_TITLE);
mLp.privateFlags |= PRIVATE_FLAG_NO_MOVE_ANIMATION;
view.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -74,6 +74,7 @@ import android.media.session.MediaSessionManager;
import android.media.session.PlaybackState;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
@@ -1531,6 +1532,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
| WindowManager.LayoutParams.FLAG_SPLIT_TOUCH
| WindowManager.LayoutParams.FLAG_SLIPPERY,
PixelFormat.TRANSLUCENT);
lp.token = new Binder();
// this will allow the navbar to run in an overlay on devices that support this
if (ActivityManager.isHighEndGfx()) {
lp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
View File

@@ -22,6 +22,7 @@ import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.res.Resources;
import android.graphics.PixelFormat;
import android.os.Binder;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.os.Trace;
@@ -97,6 +98,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback {
| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
| WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS,
PixelFormat.TRANSLUCENT);
mLp.token = new Binder();
mLp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
mLp.gravity = Gravity.TOP;
mLp.softInputMode = WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE;

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

@@ -2622,22 +2622,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
* Apps. E.g. status bar.
*/
private final class NonAppWindowContainers extends DisplayChildWindowContainer<WindowToken> {
final LinkedList<WindowState> mTmpWindows = new LinkedList();
private final ToBooleanFunction<WindowState> mCollectWindowsInOrder = w -> {
int addIndex = mTmpWindows.size();
for (int i = mTmpWindows.size() - 1; i >= 0; --i) {
final WindowState current = mTmpWindows.get(i);
if (w.mBaseLayer > current.mBaseLayer) {
break;
}
addIndex = i;
}
mTmpWindows.add(addIndex, w);
return false;
};
/**
* Compares two child window tokens returns -1 if the first is lesser than the second in
* terms of z-order and 1 otherwise.
@@ -2668,29 +2652,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
addChild(token, mWindowComparator);
}
@Override
boolean forAllWindows(ToBooleanFunction<WindowState> callback,
boolean traverseTopToBottom) {
// Hack to work around WindowToken containing windows of various types there by causing
// the windows not to be returned in visual order if there is another token with a
// window that should be z-order in-between the windows of the first token. This is an
// issue due to the various window types sys-ui adds with its token.
// TODO: Have a separate token for each type of window sys-ui wants to add. Would
// require some changes to sys-ui on the token it uses for window creation vs. just
// using the default token of its process.
mTmpWindows.clear();
super.forAllWindows(mCollectWindowsInOrder, false /* traverseTopToBottom */);
while(!mTmpWindows.isEmpty()) {
final WindowState current = traverseTopToBottom
? mTmpWindows.pollLast() : mTmpWindows.pollFirst();
if (callback.apply(current)) {
return true;
}
}
return false;
}
@Override
int getOrientation() {
final WindowManagerPolicy policy = mService.mPolicy;

40
services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java
View File

@@ -83,7 +83,7 @@ public class DisplayContentTests extends WindowTestsBase {
}
@Test
public void testForAllWindows_WithImeTarget() throws Exception {
public void testForAllWindows_WithAppImeTarget() throws Exception {
final WindowState imeAppTarget =
createWindow(null, TYPE_BASE_APPLICATION, sDisplayContent, "imeAppTarget");
@@ -125,6 +125,44 @@ public class DisplayContentTests extends WindowTestsBase {
imeAppTarget.removeImmediately();
}
@Test
public void testForAllWindows_WithStatusBarImeTarget() throws Exception {
sWm.mInputMethodTarget = sStatusBarWindow;
final ArrayList<WindowState> windows = new ArrayList();
// Test forward traversal.
sDisplayContent.forAllWindows(w -> {windows.add(w);}, false /* traverseTopToBottom */);
assertEquals(sWallpaperWindow, windows.get(0));
assertEquals(sChildAppWindowBelow, windows.get(1));
assertEquals(sAppWindow, windows.get(2));
assertEquals(sChildAppWindowAbove, windows.get(3));
assertEquals(sDockedDividerWindow, windows.get(4));
assertEquals(sStatusBarWindow, windows.get(5));
assertEquals(sImeWindow, windows.get(6));
assertEquals(sImeDialogWindow, windows.get(7));
assertEquals(sNavBarWindow, windows.get(8));
// Test backward traversal.
windows.clear();
sDisplayContent.forAllWindows(w -> {windows.add(w);}, true /* traverseTopToBottom */);
assertEquals(sWallpaperWindow, windows.get(8));
assertEquals(sChildAppWindowBelow, windows.get(7));
assertEquals(sAppWindow, windows.get(6));
assertEquals(sChildAppWindowAbove, windows.get(5));
assertEquals(sDockedDividerWindow, windows.get(4));
assertEquals(sStatusBarWindow, windows.get(3));
assertEquals(sImeWindow, windows.get(2));
assertEquals(sImeDialogWindow, windows.get(1));
assertEquals(sNavBarWindow, windows.get(0));
// Clean-up
sWm.mInputMethodTarget = null;
}
@Test
public void testForAllWindows_WithInBetweenWindowToken() throws Exception {
// This window is set-up to be z-ordered between some windows that go in the same token like

5
services/tests/servicestests/src/com/android/server/wm/WindowTestsBase.java
View File

@@ -82,11 +82,10 @@ public class WindowTestsBase {
sImeDialogWindow =
createWindow(null, TYPE_INPUT_METHOD_DIALOG, sDisplayContent, "sImeDialogWindow");
sStatusBarWindow = createWindow(null, TYPE_STATUS_BAR, sDisplayContent, "sStatusBarWindow");
final WindowToken statusBarToken = sStatusBarWindow.mToken;
sNavBarWindow =
createWindow(null, TYPE_NAVIGATION_BAR, statusBarToken, "sNavBarWindow");
createWindow(null, TYPE_NAVIGATION_BAR, sDisplayContent, "sNavBarWindow");
sDockedDividerWindow =
createWindow(null, TYPE_DOCK_DIVIDER, statusBarToken, "sDockedDividerWindow");
createWindow(null, TYPE_DOCK_DIVIDER, sDisplayContent, "sDockedDividerWindow");
sAppWindow = createWindow(null, TYPE_BASE_APPLICATION, sDisplayContent, "sAppWindow");
sChildAppWindowAbove = createWindow(sAppWindow,
TYPE_APPLICATION_ATTACHED_DIALOG, sAppWindow.mToken, "sChildAppWindowAbove");