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

Always apply window insets to action modes

Browse Source 
BUG: 17567245
Change-Id: I3c37d228e3a9d3060a4fd1a86abf2ffbf91802e8
This commit is contained in:
Alan Viverette
2014-09-18 15:46:42 -07:00
parent 547f97ac93
commit 24b5f2cf95
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -2887,32 +2887,35 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (mActionModeView.getLayoutParams() instanceof MarginLayoutParams) {
MarginLayoutParams mlp = (MarginLayoutParams) mActionModeView.getLayoutParams();
boolean mlpChanged = false;
final boolean nonOverlayShown =
(getLocalFeatures() & (1 << FEATURE_ACTION_MODE_OVERLAY)) == 0
&& mActionModeView.isShown();
if (nonOverlayShown) {
// set top margin to top insets, show status guard
if (mActionModeView.isShown()) {
final boolean nonOverlay = (getLocalFeatures()
& (1 << FEATURE_ACTION_MODE_OVERLAY)) == 0;
if (mlp.topMargin != insets.getSystemWindowInsetTop()) {
mlpChanged = true;
mlp.topMargin = insets.getSystemWindowInsetTop();
if (mStatusGuard == null) {
mStatusGuard = new View(mContext);
mStatusGuard.setBackgroundColor(mContext.getResources()
.getColor(R.color.input_method_navigation_guard));
addView(mStatusGuard, indexOfChild(mStatusColorView),
new LayoutParams(LayoutParams.MATCH_PARENT, mlp.topMargin,
Gravity.START | Gravity.TOP));
} else {
LayoutParams lp = (LayoutParams) mStatusGuard.getLayoutParams();
if (lp.height != mlp.topMargin) {
lp.height = mlp.topMargin;
mStatusGuard.setLayoutParams(lp);
// Only show status guard for non-overlay modes.
if (nonOverlay) {
if (mStatusGuard == null) {
mStatusGuard = new View(mContext);
mStatusGuard.setBackgroundColor(mContext.getResources()
.getColor(R.color.input_method_navigation_guard));
addView(mStatusGuard, indexOfChild(mStatusColorView),
new LayoutParams(LayoutParams.MATCH_PARENT,
mlp.topMargin,
Gravity.START | Gravity.TOP));
} else {
LayoutParams lp = (LayoutParams) mStatusGuard.getLayoutParams();
if (lp.height != mlp.topMargin) {
lp.height = mlp.topMargin;
mStatusGuard.setLayoutParams(lp);
}
}
}
}
insets = insets.consumeSystemWindowInsets(
false, true /* top */, false, false);
showStatusGuard = true;
false, nonOverlay /* top */, false, false);
showStatusGuard = nonOverlay;
} else {
// reset top margin
if (mlp.topMargin != 0) {