diff options
| author | John Spurlock <jspurlock@google.com> | 2013-10-15 04:03:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-15 04:03:20 -0700 |
| commit | b45bdac3407a25122e37175ba0b5d8e04dfa0b1d (patch) | |
| tree | a48178caa46eeb04a07c8798458138348f58891c | |
| parent | 809ddcf1c9e2d8f66d058d7dacb0a731a52fae6c (diff) | |
| parent | 5a87a4e3554872dced265ee32551656f0a9643ac (diff) | |
| download | frameworks_base-b45bdac3407a25122e37175ba0b5d8e04dfa0b1d.zip frameworks_base-b45bdac3407a25122e37175ba0b5d8e04dfa0b1d.tar.gz frameworks_base-b45bdac3407a25122e37175ba0b5d8e04dfa0b1d.tar.bz2 | |
am 5a87a4e3: am 30408434: am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev
* commit '5a87a4e3554872dced265ee32551656f0a9643ac':
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 87dc640..e7ea1c4 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); |