Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix BigText transitions" into nyc-dev am: 2ab4f451dc am: 50844bc504

Browse Source 
am: 3c8c89db25

* commit '3c8c89db25a8296b9bae450c4bfc1a31c25ebf08':
  Fix BigText transitions

Change-Id: I64d22508c458db3b8b10359d4ac280986693f4b5
This commit is contained in:
Adrian Roos
2016-06-03 16:18:39 +00:00
committed by android-build-merger
parent 7678d6b19a 3c8c89db25
commit bec2007236
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/notification/TextViewTransformState.java
View File

@@ -47,12 +47,16 @@ public class TextViewTransformState extends TransformState {
int ownEllipsized = getEllipsisCount();
int otherEllipsized = otherTvs.getEllipsisCount();
return ownEllipsized == otherEllipsized
&& mText.getHeight() == otherTvs.mText.getHeight();
&& getInnerHeight(mText) == getInnerHeight(otherTvs.mText);
}
}
return super.sameAs(otherState);
}
private int getInnerHeight(TextView text) {
return text.getHeight() - text.getPaddingTop() - text.getPaddingBottom();
}
private int getEllipsisCount() {
Layout l = mText.getLayout();
if (l != null) {