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

Commit 3736a5cd authored by Chloris Kuo's avatar Chloris Kuo Committed by Automerger Merge Worker
Browse files

Merge "NAS Feedback UI" into sc-dev am: f953deb8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13440640

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6374d8e39193ead9a5d0d2f3b3cae607d3103173
parents ad833781 f953deb8

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1888,7 +1888,7 @@ 
    <!-- Notification Inline controls: describes how the notification was adjusted [CHAR_LIMIT=NONE] -->

    <string name="feedback_demoted">This notification was automatically &lt;b>ranked lower&lt;/b> in your shade.</string>

    <!-- Notification Inline controls: prompts the user for feedback [CHAR_LIMIT=NONE] -->

    <string name="feedback_prompt">Was this correct?</string>

    <string name="feedback_prompt">Let the developer know your feedback. Was this correct?</string>

    <!-- Notification Inline controls: responds to user provided feedback [CHAR_LIMIT=NONE] -->

    <string name="feedback_response">Thanks for your feedback!</string>

    <string name="feedback_ok">OK</string>

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/FeedbackInfoTest.java

+7 −4
Original line number Diff line number Diff line
@@ -146,7 +146,8 @@ public class FeedbackInfoTest extends SysuiTestCase { 
                mAssistantFeedbackController);

        TextView prompt = mFeedbackInfo.findViewById(R.id.prompt);

        assertEquals("This notification was automatically demoted to Silent by the system. "

                        + "Was this correct?", prompt.getText().toString());

                        + "Let the developer know your feedback. Was this correct?",

                        prompt.getText().toString());

    }



    @Test
@@ -157,7 +158,8 @@ public class FeedbackInfoTest extends SysuiTestCase { 
                mAssistantFeedbackController);

        TextView prompt = mFeedbackInfo.findViewById(R.id.prompt);

        assertEquals("This notification was automatically ranked higher in your shade. "

                        + "Was this correct?", prompt.getText().toString());

                        + "Let the developer know your feedback. Was this correct?",

                        prompt.getText().toString());

    }



    @Test
@@ -168,7 +170,7 @@ public class FeedbackInfoTest extends SysuiTestCase { 
                mAssistantFeedbackController);

        TextView prompt = mFeedbackInfo.findViewById(R.id.prompt);

        assertEquals("This notification was automatically promoted to Default by the system. "

                        + "Was this correct?",

                        + "Let the developer know your feedback. Was this correct?",

                prompt.getText().toString());

    }
@@ -180,7 +182,8 @@ public class FeedbackInfoTest extends SysuiTestCase { 
                mAssistantFeedbackController);

        TextView prompt = mFeedbackInfo.findViewById(R.id.prompt);

        assertEquals("This notification was automatically ranked lower in your shade. "

                        + "Was this correct?", prompt.getText().toString());

                        + "Let the developer know your feedback. Was this correct?",

                        prompt.getText().toString());

    }



    @Test