diff options
| author | Adrian Roos <roosa@google.com> | 2015-10-16 20:43:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-16 20:43:32 +0000 |
| commit | 70ea857859b78a708fb99ac708ead7bdaddf79a7 (patch) | |
| tree | 232ae706f6d9b463ff074167d586052e783001f6 /core | |
| parent | a762c210d2901bedce5b7972eb139c4d5e59dcd1 (diff) | |
| parent | fc7476da7a59f0fb7b07d6e188ae6d0b55f140b8 (diff) | |
| download | frameworks_base-70ea857859b78a708fb99ac708ead7bdaddf79a7.zip frameworks_base-70ea857859b78a708fb99ac708ead7bdaddf79a7.tar.gz frameworks_base-70ea857859b78a708fb99ac708ead7bdaddf79a7.tar.bz2 | |
Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
Diffstat (limited to 'core')
| -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); } } |