summaryrefslogtreecommitdiff
path: root/core/java/android/view/WindowInfo.java
diff options
context:
space:
mode:
authorPhil Weaver <pweaver@google.com>2017-08-16 13:04:20 -0700
committerPhil Weaver <pweaver@google.com>2017-08-17 16:48:48 -0700
commit5dc3ebcec692174e2f0593c934b7b56eeae5e249 (patch)
treea5764f7c84b01cba5005a81e39b47b82bd1e60a0 /core/java/android/view/WindowInfo.java
parentd87e79aae642296e9294d667c2b75c562bc20a83 (diff)
Place focus on window when a11y performs an action
Bug: 62344706 Test: Now able to bring up keyboard in split-screen mode. Also a11y CTS and unit tests pass. Change-Id: Ic4340425680c89e8fc5e586aa1d363b01fd69763
Diffstat (limited to 'core/java/android/view/WindowInfo.java')
-rw-r--r--core/java/android/view/WindowInfo.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/view/WindowInfo.java b/core/java/android/view/WindowInfo.java
index 95a63944b3bc..bb9e391ddcb4 100644
--- a/core/java/android/view/WindowInfo.java
+++ b/core/java/android/view/WindowInfo.java
@@ -41,6 +41,7 @@ public class WindowInfo implements Parcelable {
public int layer;
public IBinder token;
public IBinder parentToken;
+ public IBinder activityToken;
public boolean focused;
public final Rect boundsInScreen = new Rect();
public List<IBinder> childTokens;
@@ -66,6 +67,7 @@ public class WindowInfo implements Parcelable {
window.layer = other.layer;
window.token = other.token;
window.parentToken = other.parentToken;
+ window.activityToken = other.activityToken;
window.focused = other.focused;
window.boundsInScreen.set(other.boundsInScreen);
window.title = other.title;
@@ -99,6 +101,7 @@ public class WindowInfo implements Parcelable {
parcel.writeInt(layer);
parcel.writeStrongBinder(token);
parcel.writeStrongBinder(parentToken);
+ parcel.writeStrongBinder(activityToken);
parcel.writeInt(focused ? 1 : 0);
boundsInScreen.writeToParcel(parcel, flags);
parcel.writeCharSequence(title);
@@ -135,6 +138,7 @@ public class WindowInfo implements Parcelable {
layer = parcel.readInt();
token = parcel.readStrongBinder();
parentToken = parcel.readStrongBinder();
+ activityToken = parcel.readStrongBinder();
focused = (parcel.readInt() == 1);
boundsInScreen.readFromParcel(parcel);
title = parcel.readCharSequence();
@@ -155,6 +159,7 @@ public class WindowInfo implements Parcelable {
layer = 0;
token = null;
parentToken = null;
+ activityToken = null;
focused = false;
boundsInScreen.setEmpty();
if (childTokens != null) {