diff options
| author | Adrian Roos <roosa@google.com> | 2015-10-16 20:49:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-16 20:49:59 +0000 |
| commit | 85fae34e8146eaa25aea7f1d9a68effa0db3ce8e (patch) | |
| tree | 0b066b63ec95f9fedf29dbb46b2c7cb4e8e5d976 /core/java/com | |
| parent | 96faf5c8fad5114dda807eee1c94a1c0dc021fe8 (diff) | |
| parent | 70ea857859b78a708fb99ac708ead7bdaddf79a7 (diff) | |
| download | frameworks_base-85fae34e8146eaa25aea7f1d9a68effa0db3ce8e.zip frameworks_base-85fae34e8146eaa25aea7f1d9a68effa0db3ce8e.tar.gz frameworks_base-85fae34e8146eaa25aea7f1d9a68effa0db3ce8e.tar.bz2 | |
am 70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '70ea857859b78a708fb99ac708ead7bdaddf79a7':
Fix wrongly laid out navigation color view
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/policy/PhoneWindow.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index a7bdbe0..8e8d352 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -3010,16 +3010,16 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { int vis = show ? VISIBLE : INVISIBLE; visibilityChanged = 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) { - 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); } } |