summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTaran Singh <tarandeep@google.com>2020-01-31 17:58:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-01-31 17:58:24 +0000
commitbba1617932d80d26d410714ff5368b0e30f761dc (patch)
tree0448e46b4dfa3d8b023298d8269ff461abb3a7d6 /core/java
parent253528c2ba5197c144fbf239f5995b1a73cbe89e (diff)
parent76e9379985479f2933ded3c2d64eb1f007743689 (diff)
Merge "Use ViewRoot's attrs in Window"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/policy/PhoneWindow.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java
index f13a638f7844..863e8a2f384d 100644
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -2125,8 +2125,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
return new Pair<>(Insets.NONE, insets);
}
- boolean includeIme = (getAttributes().softInputMode & SOFT_INPUT_MASK_ADJUST)
- == SOFT_INPUT_ADJUST_RESIZE;
+ boolean includeIme =
+ (getViewRootImpl().mWindowAttributes.softInputMode & SOFT_INPUT_MASK_ADJUST)
+ == SOFT_INPUT_ADJUST_RESIZE;
Insets insetsToApply;
if (ViewRootImpl.sNewInsetsMode == 0) {
insetsToApply = insets.getSystemWindowInsets();