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

am 85fae34e: am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev

Browse Source 
* commit '85fae34e8146eaa25aea7f1d9a68effa0db3ce8e':
  Fix wrongly laid out navigation color view
This commit is contained in:
Adrian Roos
2015-10-16 20:54:40 +00:00
committed by Android Git Automerger
parent 542052dd83 85fae34e81
commit 3c439c720d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3010,16 +3010,16 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
int vis = show ? VISIBLE : INVISIBLE; int vis = show ? VISIBLE : INVISIBLE;
visibilityChanged = state.targetVisibility != vis; visibilityChanged = state.targetVisibility != vis;
state.targetVisibility = vis; state.targetVisibility = vis;
LayoutParams lp = (LayoutParams) view.getLayoutParams();
if (lp.height != resolvedHeight || lp.width != resolvedWidth
|| lp.gravity != resolvedGravity || lp.rightMargin != rightMargin) {
lp.height = resolvedHeight;
lp.width = resolvedWidth;
lp.gravity = resolvedGravity;
lp.rightMargin = rightMargin;
view.setLayoutParams(lp);
}
if (show) { if (show) {
LayoutParams lp = (LayoutParams) view.getLayoutParams();
if (lp.height != resolvedHeight || lp.width != resolvedWidth
|| lp.gravity != resolvedGravity || lp.rightMargin != rightMargin) {
lp.height = resolvedHeight;
lp.width = resolvedWidth;
lp.gravity = resolvedGravity;
lp.rightMargin = rightMargin;
view.setLayoutParams(lp);
}
view.setBackgroundColor(color); view.setBackgroundColor(color);
} }
} }