diff options
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 93f2aa5..5af32e9 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2573,11 +2573,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { final boolean hasNavBar = (isDefaultDisplay && mHasNavigationBar && mNavigationBar != null && mNavigationBar.isVisibleLw()); + final int adjust = sim & SOFT_INPUT_MASK_ADJUST; + if (!isDefaultDisplay) { if (attached != null) { // If this window is attached to another, our display // frame is the same as the one we are attached to. - setAttachedWindowFrames(win, fl, sim, attached, true, pf, df, cf, vf); + setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, cf, vf); } else { // Give the window full screen. pf.left = df.left = cf.left = mUnrestrictedScreenLeft; @@ -2596,8 +2598,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { attrs.gravity = Gravity.BOTTOM; mDockLayer = win.getSurfaceLayer(); } else { - final int adjust = sim & SOFT_INPUT_MASK_ADJUST; - if ((fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_FULLSCREEN | FLAG_LAYOUT_INSET_DECOR)) == (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR) && (sysUiFl & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) { @@ -2611,7 +2611,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (attached != null) { // If this window is attached to another, our display // frame is the same as the one we are attached to. - setAttachedWindowFrames(win, fl, sim, attached, true, pf, df, cf, vf); + setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, cf, vf); } else { if (attrs.type == TYPE_STATUS_BAR_PANEL || attrs.type == TYPE_STATUS_BAR_SUB_PANEL) { |