diff options
| author | Adam Powell <adamp@google.com> | 2015-06-17 22:42:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-17 22:42:17 +0000 |
| commit | 40359f73b189fc8547dd91e6b75a4243b23553ef (patch) | |
| tree | 1bc7d4cce983f9a73530f6289456660e3d0c8d9f /core | |
| parent | 2b18e42b7beeeb657ba739e46478e4353d3aca71 (diff) | |
| parent | 41607d5a2b8cc4a3fde4a2f75e33a00e8d957b1d (diff) | |
| download | frameworks_base-40359f73b189fc8547dd91e6b75a4243b23553ef.zip frameworks_base-40359f73b189fc8547dd91e6b75a4243b23553ef.tar.gz frameworks_base-40359f73b189fc8547dd91e6b75a4243b23553ef.tar.bz2 | |
Merge "Request application of WindowInsets when setting a content view" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/service/voice/VoiceInteractionSession.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/policy/PhoneWindow.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/service/voice/VoiceInteractionSession.java b/core/java/android/service/voice/VoiceInteractionSession.java index 0367cfc..98c684c 100644 --- a/core/java/android/service/voice/VoiceInteractionSession.java +++ b/core/java/android/service/voice/VoiceInteractionSession.java @@ -1142,7 +1142,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall mContentFrame.addView(view, new FrameLayout.LayoutParams( ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); - + mContentFrame.requestApplyInsets(); } /** @hide */ diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 294e4ba..66f6079 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -390,6 +390,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } else { mLayoutInflater.inflate(layoutResID, mContentParent); } + mContentParent.requestApplyInsets(); final Callback cb = getCallback(); if (cb != null && !isDestroyed()) { cb.onContentChanged(); @@ -419,6 +420,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } else { mContentParent.addView(view, params); } + mContentParent.requestApplyInsets(); final Callback cb = getCallback(); if (cb != null && !isDestroyed()) { cb.onContentChanged(); @@ -435,6 +437,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { Log.v(TAG, "addContentView does not support content transitions"); } mContentParent.addView(view, params); + mContentParent.requestApplyInsets(); final Callback cb = getCallback(); if (cb != null && !isDestroyed()) { cb.onContentChanged(); |