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

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

Browse Source 
* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
  Fix wrongly laid out navigation color view
This commit is contained in:
Adrian Roos
2015-10-16 20:49:59 +00:00
committed by Android Git Automerger
parent 96faf5c8fa 70ea857859
commit 85fae34e81
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3010,7 +3010,6 @@ 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;
if (show) {
LayoutParams lp = (LayoutParams) view.getLayoutParams(); LayoutParams lp = (LayoutParams) view.getLayoutParams();
if (lp.height != resolvedHeight || lp.width != resolvedWidth if (lp.height != resolvedHeight || lp.width != resolvedWidth
|| lp.gravity != resolvedGravity || lp.rightMargin != rightMargin) { || lp.gravity != resolvedGravity || lp.rightMargin != rightMargin) {
@@ -3020,6 +3019,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
lp.rightMargin = rightMargin; lp.rightMargin = rightMargin;
view.setLayoutParams(lp); view.setLayoutParams(lp);
} }
if (show) {
view.setBackgroundColor(color); view.setBackgroundColor(color);
} }
} }