am 556c456c: am be360b04: Merge "Revert "Keep landscape quickcontact title on screen"" into lmp-mr1-dev
* commit '556c456c19a31e2a3ec1171e552a50e3a469dddd':
Revert "Keep landscape quickcontact title on screen"
diff --git a/src/com/android/contacts/widget/MultiShrinkScroller.java b/src/com/android/contacts/widget/MultiShrinkScroller.java
index 20bc5b1..5106978 100644
--- a/src/com/android/contacts/widget/MultiShrinkScroller.java
+++ b/src/com/android/contacts/widget/MultiShrinkScroller.java
@@ -378,13 +378,6 @@
mTitleGradientView.setLayoutParams(titleGradientLayoutParams);
}
- private void setTitleGradientViewBottomMargin(int bottomMargin) {
- final FrameLayout.LayoutParams titleGradientLayoutParams
- = (FrameLayout.LayoutParams) mTitleGradientView.getLayoutParams();
- titleGradientLayoutParams.bottomMargin = bottomMargin;
- mTitleGradientView.setLayoutParams(titleGradientLayoutParams);
- }
-
public void setTitle(String title) {
mLargeTextView.setText(title);
mPhotoTouchInterceptOverlay.setContentDescription(title);
@@ -952,18 +945,7 @@
*/
private void updateHeaderTextSizeAndMargin() {
if (mIsTwoPanel) {
- // This is the amount of additional padding needed to keep the title text on screen.
- final int transparentHeight = mTransparentView.getLayoutParams().height;
- // We want to keep the title text on screen as we scroll, up to a point. Once we
- // scroll farther off the screen than the semi collapsed starting height, stop
- // compensating for scrolling.
- final int scrollCompensation = Math.min(transparentHeight, mTransparentStartHeight);
- mLargeTextView.setPadding(mLargeTextView.getPaddingLeft(),
- mLargeTextView.getPaddingTop(), mLargeTextView.getPaddingRight(),
- scrollCompensation);
- // Use margin to offset the title gradient instead of padding. This is necessary since
- // GradientDrawable appears to ignore the insets suggested by its View's padding.
- setTitleGradientViewBottomMargin(scrollCompensation);
+ // The text size stays at a constant size & location in two panel layouts.
return;
}