commit 0f4739f7d0d121e9cd07dd556d227f878f7bed0f
author Adam Powell <adamp@google.com> Thu Aug 18 18:52:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 18 18:52:29 2011 -0700
tree c54e94768856e5b311b794e920cb930744ad55e7
parent 7f639d33151be143f062274b0da0729c29391bdb
parent 3429ff53d0a7dcf019bf076c7a3eeb877a1a2626

Merge "Fix bug 5186258 - Incorrect window width is used for custom panel views in the MATCH_PARENT case"

policy/src/com/android/internal/policy/impl/PhoneWindow.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index c580f08..c929bbc 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -587,6 +587,13 @@
             }
         } else if (!st.isInListMode()) {
             width = MATCH_PARENT;
+        } else if (st.createdPanelView != null) {
+            // If we already had a panel view, carry width=MATCH_PARENT through
+            // as we did above when it was created.
+            ViewGroup.LayoutParams lp = st.createdPanelView.getLayoutParams();
+            if (lp != null && lp.width == ViewGroup.LayoutParams.MATCH_PARENT) {
+                width = MATCH_PARENT;
+            }
         }
 
         st.isOpen = true;