diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-09 21:57:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 21:57:01 +0000 |
| commit | 65e911261d972758577f76cf41c6c0c532896fe1 (patch) | |
| tree | 5efec4d980491e9490307be40ab4059f4911ad86 /policy/src | |
| parent | b0975540a42f10fad08364b636a22bcba33609a6 (diff) | |
| parent | c68d577f29604d205573ee4253704c5b2c5e4f81 (diff) | |
| download | frameworks_base-65e911261d972758577f76cf41c6c0c532896fe1.zip frameworks_base-65e911261d972758577f76cf41c6c0c532896fe1.tar.gz frameworks_base-65e911261d972758577f76cf41c6c0c532896fe1.tar.bz2 | |
Merge "Allow IMEs to extend below nav bar, remove SystemUI veto." into klp-dev
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 8b6b60a..e9e3b27 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2991,8 +2991,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { pf.left = df.left = of.left = cf.left = vf.left = mDockLeft; 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 always go above the nav bar. - pf.bottom = df.bottom = of.bottom = cf.bottom = vf.bottom = mStableBottom; + // IM dock windows layout below the nav bar... + pf.bottom = df.bottom = of.bottom = mRestrictedScreenTop + mRestrictedScreenHeight; + // ...with content insets above the nav bar + cf.bottom = vf.bottom = mStableBottom; // IM dock windows always go to the bottom of the screen. attrs.gravity = Gravity.BOTTOM; mDockLayer = win.getSurfaceLayer(); |