Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 352e6d77: am 40359f73: Merge "Request application of WindowInsets when setting a content view" into mnc-dev

Browse Source 
* commit '352e6d77ef73d846ee840d26e6ccacb54e485eed':
  Request application of WindowInsets when setting a content view
This commit is contained in:
Adam Powell
2015-06-17 23:06:48 +00:00
committed by Android Git Automerger
parent d21f5ee6ab 352e6d77ef
commit 3977bad2b0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/voice/VoiceInteractionSession.java
View File

@@ -1142,7 +1142,7 @@ public class VoiceInteractionSession implements KeyEvent.Callback, ComponentCall
mContentFrame.addView(view, new FrameLayout.LayoutParams( mContentFrame.addView(view, new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT)); ViewGroup.LayoutParams.MATCH_PARENT));
mContentFrame.requestApplyInsets();
} }
/** @hide */ /** @hide */

3
core/java/com/android/internal/policy/PhoneWindow.java
View File

@@ -390,6 +390,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
} else { } else {
mLayoutInflater.inflate(layoutResID, mContentParent); mLayoutInflater.inflate(layoutResID, mContentParent);
} }
mContentParent.requestApplyInsets();
final Callback cb = getCallback(); final Callback cb = getCallback();
if (cb != null && !isDestroyed()) { if (cb != null && !isDestroyed()) {
cb.onContentChanged(); cb.onContentChanged();
@@ -419,6 +420,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
} else { } else {
mContentParent.addView(view, params); mContentParent.addView(view, params);
} }
mContentParent.requestApplyInsets();
final Callback cb = getCallback(); final Callback cb = getCallback();
if (cb != null && !isDestroyed()) { if (cb != null && !isDestroyed()) {
cb.onContentChanged(); cb.onContentChanged();
@@ -435,6 +437,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
Log.v(TAG, "addContentView does not support content transitions"); Log.v(TAG, "addContentView does not support content transitions");
} }
mContentParent.addView(view, params); mContentParent.addView(view, params);
mContentParent.requestApplyInsets();
final Callback cb = getCallback(); final Callback cb = getCallback();
if (cb != null && !isDestroyed()) { if (cb != null && !isDestroyed()) {
cb.onContentChanged(); cb.onContentChanged();