Merge "Add new WindowId for cross-process monitoring of focus." into jb-mr2-dev

1 files changed, 16 insertions, 0 deletions

diff --git a/api/current.txt b/api/current.txt
index 3878aa1..2e1dcf6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25279,6 +25279,7 @@ package android.view {
     method public int getVisibility();
     method public final int getWidth();
     method protected int getWindowAttachCount();
+    method public android.view.WindowId getWindowId();
     method public int getWindowSystemUiVisibility();
     method public android.os.IBinder getWindowToken();
     method public int getWindowVisibility();
@@ -26224,6 +26225,21 @@ package android.view {
     method public abstract android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback);
   }
 
+  public class WindowId implements android.os.Parcelable {
+    method public int describeContents();
+    method public boolean isFocused();
+    method public void registerFocusObserver(android.view.WindowId.FocusObserver);
+    method public void unregisterFocusObserver(android.view.WindowId.FocusObserver);
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator CREATOR;
+  }
+
+  public static abstract class WindowId.FocusObserver {
+    ctor public WindowId.FocusObserver();
+    method public abstract void onFocusGained(android.view.WindowId);
+    method public abstract void onFocusLost(android.view.WindowId);
+  }
+
   public abstract interface WindowManager implements android.view.ViewManager {
     method public abstract android.view.Display getDefaultDisplay();
     method public abstract void removeViewImmediate(android.view.View);