Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5513616 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents 9c9aec72 e3f23a36

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ LOCAL_SRC_FILES += \ 
	core/java/android/view/IOnKeyguardExitResult.aidl \

	core/java/android/view/IRotationWatcher.aidl \

	core/java/android/view/IWindow.aidl \

	core/java/android/view/IWindowFocusObserver.aidl \

	core/java/android/view/IWindowId.aidl \

	core/java/android/view/IWindowManager.aidl \

	core/java/android/view/IWindowSession.aidl \

	core/java/android/speech/IRecognitionListener.aidl \

api/current.txt

+16 −0
Original line number Diff line number Diff line
@@ -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);

























core/java/android/view/IWindowFocusObserver.aidl
0 → 100644



+23
−0




























Original line number
Diff line number
Diff line













/* Copyright 2013, The Android Open Source Project













**













** Licensed under the Apache License, Version 2.0 (the "License");













** you may not use this file except in compliance with the License.













** You may obtain a copy of the License at













**













**     http://www.apache.org/licenses/LICENSE-2.0













**













** Unless required by applicable law or agreed to in writing, software













** distributed under the License is distributed on an "AS IS" BASIS,













** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













** See the License for the specific language governing permissions and













** limitations under the License.













*/



























package android.view;



























/** {@hide} */













interface IWindowFocusObserver













{













    void focusGained(IBinder inputToken);













    void focusLost(IBinder inputToken);













}
























core/java/android/view/IWindowId.aidl
0 → 100644



+26
−0




























Original line number
Diff line number
Diff line













/* Copyright 2013, The Android Open Source Project













**













** Licensed under the Apache License, Version 2.0 (the "License");













** you may not use this file except in compliance with the License.













** You may obtain a copy of the License at













**













**     http://www.apache.org/licenses/LICENSE-2.0













**













** Unless required by applicable law or agreed to in writing, software













** distributed under the License is distributed on an "AS IS" BASIS,













** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













** See the License for the specific language governing permissions and













** limitations under the License.













*/



























package android.view;



























import android.view.IWindowFocusObserver;



























/** {@hide} */













interface IWindowId













{













    void registerFocusObserver(IWindowFocusObserver observer);













    void unregisterFocusObserver(IWindowFocusObserver observer);













    boolean isFocused();













}
























core/java/android/view/IWindowSession.aidl



+3
−0




























Original line number
Diff line number
Diff line








@@ -24,6 +24,7 @@ import android.graphics.Region;













import android.os.Bundle;















import android.view.InputChannel;















import android.view.IWindow;













import android.view.IWindowId;















import android.view.MotionEvent;















import android.view.WindowManager;















import android.view.Surface;










@@ -188,4 +189,6 @@ interface IWindowSession {













     * Notifies that a rectangle on the screen has been requested.















     */















    void onRectangleOnScreenRequested(IBinder token, in Rect rectangle, boolean immediate);



























    IWindowId getWindowId(IBinder window);















}