diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-10 11:21:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 11:21:37 -0700 |
| commit | 107c3fed5c26ce2202b6c9394e14e30e49642c85 (patch) | |
| tree | 824c1d56a87002115affd29fd35d87925a8478ae /policy/src | |
| parent | 16767ff5f36ed986d4237936807123e743eb41b2 (diff) | |
| parent | a8c73fbd5c90a0d4eacc7aaedc0ca30cfcd5f621 (diff) | |
| download | frameworks_base-107c3fed5c26ce2202b6c9394e14e30e49642c85.zip frameworks_base-107c3fed5c26ce2202b6c9394e14e30e49642c85.tar.gz frameworks_base-107c3fed5c26ce2202b6c9394e14e30e49642c85.tar.bz2 | |
am a8c73fbd: am a619afd6: Merge "IME navigation guard implemented as a View." into klp-dev
* commit 'a8c73fbd5c90a0d4eacc7aaedc0ca30cfcd5f621':
IME navigation guard implemented as a View.
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index e9e3b27..225bb94 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2992,7 +2992,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { pf.top = df.top = of.top = cf.top = vf.top = mDockTop; pf.right = df.right = of.right = cf.right = vf.right = mDockRight; // IM dock windows layout below the nav bar... - pf.bottom = df.bottom = of.bottom = mRestrictedScreenTop + mRestrictedScreenHeight; + pf.bottom = df.bottom = of.bottom = mUnrestrictedScreenTop + mUnrestrictedScreenHeight; // ...with content insets above the nav bar cf.bottom = vf.bottom = mStableBottom; // IM dock windows always go to the bottom of the screen. |