diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-14 18:30:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-14 18:30:13 -0700 |
| commit | 30408434d3c04efa2b4a18838f9dfe0b5760f4ef (patch) | |
| tree | 97461d3945cfade17d5feaff82dd94f72b5edda0 | |
| parent | 2c163ee4eb1e1ec835bba1c906e4ba1f86983c46 (diff) | |
| parent | f803336028e1a183facec1a526268f2bcf54e16b (diff) | |
| download | frameworks_base-30408434d3c04efa2b4a18838f9dfe0b5760f4ef.zip frameworks_base-30408434d3c04efa2b4a18838f9dfe0b5760f4ef.tar.gz frameworks_base-30408434d3c04efa2b4a18838f9dfe0b5760f4ef.tar.bz2 | |
am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev
* commit 'f803336028e1a183facec1a526268f2bcf54e16b':
Give IMEs the entire screen to use for measuring purposes.
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index c86bc45..9461068 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1179,7 +1179,8 @@ public final class ViewRootImpl implements ViewParent, mFullRedrawNeeded = true; mLayoutRequested = true; - if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL) { + if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL + || lp.type == WindowManager.LayoutParams.TYPE_INPUT_METHOD) { // NOTE -- system code, won't try to do compat mode. Point size = new Point(); mDisplay.getRealSize(size); @@ -1273,7 +1274,8 @@ public final class ViewRootImpl implements ViewParent, || lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) { windowSizeMayChange = true; - if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL) { + if (lp.type == WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL + || lp.type == WindowManager.LayoutParams.TYPE_INPUT_METHOD) { // NOTE -- system code, won't try to do compat mode. Point size = new Point(); mDisplay.getRealSize(size); |