diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-09-05 22:56:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 22:56:34 +0000 |
| commit | 43ddc89c6f4992e34a5afd8c924cc38c5b563df5 (patch) | |
| tree | be0d20d51590be6d843fac328d61f37e7ea66138 | |
| parent | 56151b82c3dac3908ac8776a2a71f107fb4ecdbc (diff) | |
| parent | cf930c704f7e27dd9e8fd0dd7106ad6ff600e409 (diff) | |
| download | packages_apps_Contacts-43ddc89c6f4992e34a5afd8c924cc38c5b563df5.tar.gz packages_apps_Contacts-43ddc89c6f4992e34a5afd8c924cc38c5b563df5.tar.bz2 packages_apps_Contacts-43ddc89c6f4992e34a5afd8c924cc38c5b563df5.zip | |
Merge "Don't let QC title overflow photo container" into lmp-dev
| -rw-r--r-- | src/com/android/contacts/widget/MultiShrinkScroller.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java index c5492d22a..47b6d6fe5 100644 --- a/src/com/android/contacts/widget/MultiShrinkScroller.java +++ b/src/com/android/contacts/widget/MultiShrinkScroller.java @@ -347,6 +347,11 @@ public class MultiShrinkScroller extends FrameLayout { 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(); |