Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35156758 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Don't stop adding smart suggestions just because one doesn't fit. 

Up until now we've added smart suggestions to a notification from a
certain list (in order). When we've reached a suggestion that doesn't
fit in the notification we've simply skipped the rest of the
suggestions. With this CL we only skip the suggestion that's too long,
and instead try adding the less-prioritized suggestions.

Example:
Assume the notification can fit suggestions 1, 2, and 4 (suggestion 3 is
too long to fit):
"Action1", "Action2", "LongestActionEvererererrer", "Action4"

Behaviour before this CL: only the first two suggestions are shown:
"Action1", "Action2"
Behaviour after this CL: actions 1, 2, and 4 are shown:
"Action1", "Action2", "Action4"

Bug: 121250868
Test: atest SystemUITests
Change-Id: Icd90eebe1514e88a9dd0d48db050325764830155
parent 2b9930d0

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

+3 −3
Original line number Diff line number Diff line
@@ -436,9 +436,9 @@ public class SmartReplyView extends ViewGroup { 
                    markButtonsWithPendingSqueezeStatusAs(

                            LayoutParams.SQUEEZE_STATUS_FAILED, coveredSuggestions);



                    // The current button doesn't fit, so there's no point in measuring further

                    // buttons.

                    break;

                    // The current button doesn't fit, keep on adding lower-priority buttons in case

                    // any of those fit.

                    continue;

                }



                // The current button fits, so mark all squeezed buttons as "successfully squeezed"

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

+88 −0
Original line number Diff line number Diff line
@@ -855,4 +855,92 @@ public class SmartReplyViewTest extends SysuiTestCase { 
        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(1), mView.getChildAt(2));

        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(2), mView.getChildAt(3));

    }



    /**

     * Test to ensure that we try to add all possible actions - if we find one action that's too

     * long we just skip that one rather than quitting altogether.

     */

    @Test

    public void testMeasure_skipTooLongActions() {

        String[] choices = new String[] {};

        String[] actions = new String[] {

                "a1", "a2", "this action is soooooooo long it's ridiculous", "a4"};



        // All actions should be displayed as DOUBLE-line smart action buttons.

        ViewGroup expectedView = buildExpectedView(new String[] {}, 1 /* lineCount */,

                createActions(new String[] {"a1", "a2", "a4"}));

        expectedView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);



        setSmartRepliesAndActions(choices, actions);

        mView.measure(

                MeasureSpec.makeMeasureSpec(expectedView.getMeasuredWidth(), MeasureSpec.AT_MOST),

                MeasureSpec.UNSPECIFIED);



        assertEqualMeasures(expectedView, mView);

        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(0), mView.getChildAt(0));

        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(1), mView.getChildAt(1));

        assertReplyButtonHidden(mView.getChildAt(2));

        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(2), mView.getChildAt(3));

    }



    /**

     * Test to ensure that we try to add all possible replies - if we find one reply that's too

     * long we just skip that one rather than quitting altogether.

     */

    @Test

    public void testMeasure_skipTooLongReplies() {

        String[] choices = new String[] {

                "r1", "r2", "this reply is soooooooo long it's ridiculous", "r4"};

        String[] actions = new String[] {};



        // All replies should be displayed as single-line smart reply buttons.

        ViewGroup expectedView = buildExpectedView(new String[] {"r1", "r2", "r4"},

                1 /* lineCount */, Collections.emptyList());

        expectedView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);



        setSmartRepliesAndActions(choices, actions);

        mView.measure(

                MeasureSpec.makeMeasureSpec(expectedView.getMeasuredWidth(), MeasureSpec.AT_MOST),

                MeasureSpec.UNSPECIFIED);



        assertEqualMeasures(expectedView, mView);

        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(0), mView.getChildAt(0));

        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(1), mView.getChildAt(1));

        assertReplyButtonHidden(mView.getChildAt(2));

        assertReplyButtonShownWithEqualMeasures(expectedView.getChildAt(2), mView.getChildAt(3));

    }



    /**

     * Test to ensure that we try to add all possible replies and actions - if we find a reply or

     * action that's too long we just skip that one rather than quitting altogether.

     */

    @Test

    public void testMeasure_skipTooLongRepliesAndActions() {

        String[] choices = new String[] {

                "r1", "r2", "this reply is soooooooo long it's ridiculous", "r4"};

        String[] actions = new String[] {

                "a1", "ThisActionIsSooooooooLongItsRidiculousIPromise"};



        // All replies should be displayed as single-line smart reply buttons.

        ViewGroup expectedView = buildExpectedView(new String[] {"r1", "r2", "r4"},

                1 /* lineCount */, createActions(new String[] {"a1"}));

        expectedView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);



        setSmartRepliesAndActions(choices, actions);

        mView.measure(

                MeasureSpec.makeMeasureSpec(expectedView.getMeasuredWidth(), MeasureSpec.AT_MOST),

                MeasureSpec.UNSPECIFIED);



        assertEqualMeasures(expectedView, mView);

        assertReplyButtonShownWithEqualMeasures(

                expectedView.getChildAt(0), mView.getChildAt(0)); // r1

        assertReplyButtonShownWithEqualMeasures(

                expectedView.getChildAt(1), mView.getChildAt(1)); // r2

        assertReplyButtonHidden(mView.getChildAt(2)); // long reply

        assertReplyButtonShownWithEqualMeasures(

                expectedView.getChildAt(2), mView.getChildAt(3)); // r4

        assertReplyButtonShownWithEqualMeasures(

                expectedView.getChildAt(3), mView.getChildAt(4)); // a1

        assertReplyButtonHidden(mView.getChildAt(5)); // long action

    }

}