am 8da6bc53: Merge "Resize lock screen widgets when IME is open." into klp-dev

* commit '8da6bc53c89020de7e6c252bcb1e658f4fb0c32f':
  Resize lock screen widgets when IME is open.
This commit is contained in:
Alan Viverette
2013-10-11 10:34:08 -07:00
committed by Android Git Automerger

View File

@@ -195,11 +195,9 @@ public class MultiPaneChallengeLayout extends ViewGroup implements ChallengeLayo
// and that the window is LAYOUT_IN_SCREEN. // and that the window is LAYOUT_IN_SCREEN.
virtualHeight = mDisplayMetrics.heightPixels - root.getPaddingTop() - mInsets.top; virtualHeight = mDisplayMetrics.heightPixels - root.getPaddingTop() - mInsets.top;
} }
if (lp.childType == LayoutParams.CHILD_TYPE_WIDGET || if (lp.childType == LayoutParams.CHILD_TYPE_USER_SWITCHER) {
lp.childType == LayoutParams.CHILD_TYPE_USER_SWITCHER) { // Always measure the user switcher as if there were no IME insets
// Always measure the widget pager/user switcher as if there were no IME insets // on the window.
// on the window. We want to avoid resizing widgets when possible as it can
// be ugly/expensive. This lets us simply clip them instead.
return virtualHeight - heightUsed; return virtualHeight - heightUsed;
} else if (lp.childType == LayoutParams.CHILD_TYPE_PAGE_DELETE_DROP_TARGET) { } else if (lp.childType == LayoutParams.CHILD_TYPE_PAGE_DELETE_DROP_TARGET) {
return height; return height;