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

Merge "Fix issue with compressed smart replies." into pi-dev

Browse Source 
am: 895ed11d03

Change-Id: I7743b004a7ddc9e46f3366f7c15058aad12686c4
This commit is contained in:
Kenny Guy
2018-05-11 07:29:30 -07:00
committed by android-build-merger
parent 9252fbc726 895ed11d03
commit 97511bc250
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyView.java
View File

@@ -495,12 +495,14 @@ public class SmartReplyView extends ViewGroup {
// measured with the wrong number of lines).
if (child.getPaddingLeft() != buttonPaddingHorizontal) {
requiresNewMeasure = true;
if (buttonPaddingHorizontal == mSingleLineButtonPaddingHorizontal) {
// Decrease padding (2->1 line).
newWidth -= mSingleToDoubleLineButtonWidthIncrease;
} else {
// Increase padding (1->2 lines).
newWidth += mSingleToDoubleLineButtonWidthIncrease;
if (newWidth != Integer.MAX_VALUE) {
if (buttonPaddingHorizontal == mSingleLineButtonPaddingHorizontal) {
// Change padding (2->1 line).
newWidth -= mSingleToDoubleLineButtonWidthIncrease;
} else {
// Change padding (1->2 lines).
newWidth += mSingleToDoubleLineButtonWidthIncrease;
}
}
child.setPadding(buttonPaddingHorizontal, child.getPaddingTop(),
buttonPaddingHorizontal, child.getPaddingBottom());

36
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SmartReplyViewTest.java
View File

@@ -347,6 +347,30 @@ public class SmartReplyViewTest extends SysuiTestCase {
assertEqualLayouts(expectedView.getChildAt(2), mView.getChildAt(2));
}
@Test
public void testMeasure_dropLongest() {
final CharSequence[] choices = new CharSequence[]{"Short", "Short",
"LooooooongUnbreakableReplyyyyy"};
// Short choices should be shown as single line views
ViewGroup expectedView = buildExpectedView(
new CharSequence[]{"Short", "Short"}, 1);
expectedView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
expectedView.layout(10, 10, 10 + expectedView.getMeasuredWidth(),
10 + expectedView.getMeasuredHeight());
setRepliesFromRemoteInput(choices);
mView.measure(
MeasureSpec.makeMeasureSpec(expectedView.getMeasuredWidth(), MeasureSpec.AT_MOST),
MeasureSpec.UNSPECIFIED);
mView.layout(10, 10, 10 + mView.getMeasuredWidth(), 10 + mView.getMeasuredHeight());
assertEqualLayouts(expectedView, mView);
assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(0), mView.getChildAt(0));
assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(1), mView.getChildAt(1));
assertReplyButtonHidden(mView.getChildAt(2));
}
private void setRepliesFromRemoteInput(CharSequence[] choices) {
PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0,
new Intent(TEST_ACTION), 0);
@@ -407,10 +431,7 @@ public class SmartReplyViewTest extends SysuiTestCase {
private static void assertReplyButtonShownWithEqualMeasures(View expected, View actual) {
assertReplyButtonShown(actual);
assertEqualMeasures(expected, actual);
assertEquals(expected.getPaddingLeft(), actual.getPaddingLeft());
assertEquals(expected.getPaddingTop(), actual.getPaddingTop());
assertEquals(expected.getPaddingRight(), actual.getPaddingRight());
assertEquals(expected.getPaddingBottom(), actual.getPaddingBottom());
assertEqualPadding(expected, actual);
}
private static void assertReplyButtonShown(View view) {
@@ -427,4 +448,11 @@ public class SmartReplyViewTest extends SysuiTestCase {
assertEquals(expected.getRight(), actual.getRight());
assertEquals(expected.getBottom(), actual.getBottom());
}
private static void assertEqualPadding(View expected, View actual) {
assertEquals(expected.getPaddingLeft(), actual.getPaddingLeft());
assertEquals(expected.getPaddingTop(), actual.getPaddingTop());
assertEquals(expected.getPaddingRight(), actual.getPaddingRight());
assertEquals(expected.getPaddingBottom(), actual.getPaddingBottom());
}
}