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

Merge "NAS Feedback UI" into sc-dev

Browse Source
This commit is contained in:
Chloris Kuo
2021-02-02 21:25:33 +00:00
committed by Android (Google) Code Review
parent 5ce8ae9c74 af92d3af64
commit f953deb8bc
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/strings.xml
View File

@@ -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>

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

@@ -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