diff options
| author | Yohei Yukawa <yukawa@google.com> | 2015-07-01 00:51:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 00:51:36 +0000 |
| commit | 63c4a7185cf1b03ba45cc3147e87270502334387 (patch) | |
| tree | 1a55e2c143a6c9b5370110a7a1fac3b57fa820e7 /core/java/android/view | |
| parent | fc2740ae571f68f1a83bf3197655970e7e597de4 (diff) | |
| parent | d1a092218b4b40cfd53a643e0ae01095815f4b30 (diff) | |
| download | frameworks_base-63c4a7185cf1b03ba45cc3147e87270502334387.zip frameworks_base-63c4a7185cf1b03ba45cc3147e87270502334387.tar.gz frameworks_base-63c4a7185cf1b03ba45cc3147e87270502334387.tar.bz2 | |
Merge "Reland "Fixed constant window switching on lock screen..."" into mnc-dev
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 |