summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-10-18 17:34:42 -0400
committerJohn Spurlock <jspurlock@google.com>2013-10-18 18:41:22 -0400
commitae3349e1c34f7aceddc526cd11d9ac44951e97b6 (patch)
treecb239dd55da5783b75d452982c80d508d70e4edf /policy/src
parentac2d61a2d731946afed300d63039d6d712fd7f4c (diff)
downloadframeworks_base-ae3349e1c34f7aceddc526cd11d9ac44951e97b6.zip
frameworks_base-ae3349e1c34f7aceddc526cd11d9ac44951e97b6.tar.gz
frameworks_base-ae3349e1c34f7aceddc526cd11d9ac44951e97b6.tar.bz2
Move the IME navigation guard view up to decor.
Although the IME windows are now allowed to extend into the nav bar, some IMEs were making assumptions about computed insets based on the height of the content view. So our navigation bar view (opaque view blocking the nav bar area to avoid the island effect when transparent) needs to live above the content view in the hierarchy, making the content view the same height as it was before. A surgical spot to put the guard view is up at the root view (PhoneWindow.DecorView). fitSystemWindows is always called since this view is not recreated, and the layout is stable: waiting until the IME is attached to the window is too late to add a guard view. This is above the screen_* layouts, so will work without having to touch all of them. And it only affects windows of TYPE_INPUT_METHOD. Bug:11237795 Change-Id: I6a93f30aec83f1cecfb854073046cbc87ab4aa66
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java32
1 files changed, 32 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index eba689d..1745bc7 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -23,6 +23,8 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import static android.view.WindowManager.LayoutParams.*;
import android.view.ViewConfiguration;
+
+import com.android.internal.R;
import com.android.internal.view.RootViewSurfaceTaker;
import com.android.internal.view.StandaloneActionMode;
import com.android.internal.view.menu.ContextMenuBuilder;
@@ -1920,6 +1922,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
private PopupWindow mActionModePopup;
private Runnable mShowActionModePopup;
+ // View added at runtime to IME windows to cover the navigation bar
+ private View mNavigationGuard;
+
public DecorView(Context context, int featureId) {
super(context);
mFeatureId = featureId;
@@ -2479,6 +2484,33 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
@Override
protected boolean fitSystemWindows(Rect insets) {
mFrameOffsets.set(insets);
+
+ // IMEs lay out below the nav bar, but the content view must not (for back compat)
+ if (getAttributes().type == WindowManager.LayoutParams.TYPE_INPUT_METHOD) {
+ // prevent the content view from including the nav bar height
+ if (mContentParent != null) {
+ if (mContentParent.getLayoutParams() instanceof MarginLayoutParams) {
+ MarginLayoutParams mlp =
+ (MarginLayoutParams) mContentParent.getLayoutParams();
+ mlp.bottomMargin = insets.bottom;
+ mContentParent.setLayoutParams(mlp);
+ }
+ }
+ // position the navigation guard view, creating it if necessary
+ if (mNavigationGuard == null) {
+ mNavigationGuard = new View(mContext);
+ mNavigationGuard.setBackgroundColor(mContext.getResources()
+ .getColor(R.color.input_method_navigation_guard));
+ addView(mNavigationGuard, new LayoutParams(
+ LayoutParams.MATCH_PARENT, insets.bottom,
+ Gravity.START | Gravity.BOTTOM));
+ } else {
+ LayoutParams lp = (LayoutParams) mNavigationGuard.getLayoutParams();
+ lp.height = insets.bottom;
+ mNavigationGuard.setLayoutParams(lp);
+ }
+ }
+
if (getForeground() != null) {
drawableChanged();
}