diff options
| author | Yohei Yukawa <yukawa@google.com> | 2015-06-30 16:22:05 -0700 |
|---|---|---|
| committer | Yohei Yukawa <yukawa@google.com> | 2015-06-30 16:22:05 -0700 |
| commit | d1a092218b4b40cfd53a643e0ae01095815f4b30 (patch) | |
| tree | dc8e2029cd79f828073442f05c476705ee45667d /core/java/android/view | |
| parent | f62f4c94a36f5c2f7ad3c70316dc585ea3fd721a (diff) | |
| download | frameworks_base-d1a092218b4b40cfd53a643e0ae01095815f4b30.zip frameworks_base-d1a092218b4b40cfd53a643e0ae01095815f4b30.tar.gz frameworks_base-d1a092218b4b40cfd53a643e0ae01095815f4b30.tar.bz2 | |
Reland "Fixed constant window switching on lock screen..."
This is a manual reland of I3680256d41793f62def42fda00e26db1dcc9,
which was certainly merged into lmp-mr1-dev then auto-merged into
master but silently lost there for unknown reasons when
I8c42a1e6091b0fe1253e90265ac248087e was auto-merged into master.
Changes in WindowAnimator.java was already covered by
I2933eaf0ab55fe31cb382c46c411033e33a756e0 so this CL does not
include that change.
Bug: 18021493
Bug: 22158649
Change-Id: Ib1bf9f5bef44d0400230afc32231f7d1f3a1c98b
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index ca5f5ad..dd6d3ca 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -913,12 +913,13 @@ public interface WindowManagerPolicy { /** * Called following layout of all window to apply policy to each window. - * + * * @param win The window being positioned. - * @param attrs The LayoutParams of the window. + * @param attrs The LayoutParams of the window. + * @param attached For sub-windows, the window it is attached to. Otherwise null. */ public void applyPostLayoutPolicyLw(WindowState win, - WindowManager.LayoutParams attrs); + WindowManager.LayoutParams attrs, WindowState attached); /** * Called following layout of all windows and after policy has been applied |