commit cf930c704f7e27dd9e8fd0dd7106ad6ff600e409
author Brian Attwell <brianattwell@google.com> Fri Sep 05 15:22:23 2014 -0700
committer Brian Attwell <brianattwell@google.com> Fri Sep 05 15:22:23 2014 -0700
tree a055c69e3abec0032266f4baf9de8f24a8ad31e2
parent 056e4a7b42973c0c5c4a35c70b995c007bd68cb7

Don't let QC title overflow photo container

Bug: 17402906
Change-Id: I699edfe025787674516831cfd4427ad2fb80adca

src/com/android/contacts/widget/MultiShrinkScroller.java

diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index c5492d2..47b6d6f 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -347,6 +347,11 @@
                             largeTextLayoutParams.leftMargin - largeTextLayoutParams.rightMargin;
                     largeTextLayoutParams.gravity = Gravity.BOTTOM | Gravity.START;
                     mLargeTextView.setLayoutParams(largeTextLayoutParams);
+                } else {
+                    // Set the width of mLargeTextView as if it was nested inside
+                    // mPhotoViewContainer.
+                    mLargeTextView.setWidth(mPhotoViewContainer.getWidth()
+                            - 2 * mMaximumTitleMargin);
                 }
 
                 calculateCollapsedLargeTitlePadding();