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

Merge "autofill: fix window location in splitwindow and dialog" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-04 22:06:49 +00:00
committed by Android (Google) Code Review
parent 48920ab48d 640e9b9bf4
commit 2b26f83f12
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/autofill/AutofillPopupWindow.java
View File

@@ -79,6 +79,12 @@ public class AutofillPopupWindow extends PopupWindow {
public AutofillPopupWindow(@NonNull IAutofillWindowPresenter presenter) {
mWindowPresenter = new WindowPresenter(presenter);
// Here is a bit of voodoo - we want to show the window as system
// controlled one so it covers app windows, but at the same time it has to be
// an application type (so it's contained inside the application area).
// Hence, we set it to the application type with the highest z-order, which currently
// is TYPE_APPLICATION_ABOVE_SUB_PANEL.
setWindowLayoutType(WindowManager.LayoutParams.TYPE_APPLICATION_ABOVE_SUB_PANEL);
setTouchModal(false);
setOutsideTouchable(true);
setInputMethodMode(INPUT_METHOD_NOT_NEEDED);

12
services/autofill/java/com/android/server/autofill/ui/FillUi.java
View File

@@ -656,6 +656,8 @@ final class FillUi {
private final WindowManager mWm;
private final View mContentView;
private boolean mShowing;
// Used on dump only
private WindowManager.LayoutParams mShowParams;
/**
* Constructor.
@@ -672,16 +674,13 @@ final class FillUi {
* Shows the window.
*/
public void show(WindowManager.LayoutParams params) {
mShowParams = params;
if (sVerbose) {
Slog.v(TAG, "show(): showing=" + mShowing + ", params=" + paramsToString(params));
}
try {
// Okay here is a bit of voodoo - we want to show the window as system
// controlled one so it covers app windows - adjust the params accordingly.
params.type = WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
params.token = null;
params.packageName = "android";
params.flags |= WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
params.setTitle("Autofill UI"); // Title is set for debugging purposes
if (!mShowing) {
params.accessibilityTitle = mContentView.getContext()
.getString(R.string.autofill_picker_accessibility_title);
@@ -760,6 +759,9 @@ final class FillUi {
pw.println();
pw.print(prefix2); pw.print("showing: "); pw.println(mWindow.mShowing);
pw.print(prefix2); pw.print("view: "); pw.println(mWindow.mContentView);
if (mWindow.mShowParams != null) {
pw.print(prefix2); pw.print("params: "); pw.println(mWindow.mShowParams);
}
pw.print(prefix2); pw.print("screen coordinates: ");
if (mWindow.mContentView == null) {
pw.println("N/A");