feat(A11yFeedback): Pixel overlay to expose the feedback bucket ID
This change introduces a feature provider for Pixel overlays, allowing
customization of the feedback bucket ID on Android.
Bug: 393980229
Test: Manual testing for Pixel and non-Pixel overlay in real device
Test: atest AccessibilitySettingsTest
FeedbackManagerTest
Flag: com.android.server.accessibility.enable_low_vision_generic_feedback
Change-Id: Ieeb1dba4de5c13a275e66781621cbfcca7219a5e
This commit is contained in:
@@ -15,7 +15,6 @@
|
||||
*/
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.android.settings.accessibility.FeedbackManager.ACCESSIBILITY_FEEDBACK_REQUEST_BUCKET_ID;
|
||||
import static com.android.settings.accessibility.FeedbackManager.CATEGORY_TAG;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
@@ -44,7 +43,8 @@ public class FeedbackManagerTest {
|
||||
@Rule
|
||||
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
|
||||
|
||||
private static final String FEEDBACK_PACKAGE = "test.feedback.package";
|
||||
private static final String PACKAGE_NAME = "test.feedback.package";
|
||||
private static final String DEFAULT_CATEGORY = "default category";
|
||||
|
||||
private Activity mActivity;
|
||||
|
||||
@@ -55,8 +55,9 @@ public class FeedbackManagerTest {
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void isAvailable_enableLowVisionGenericFeedbackWithPackageAndActivity_returnsTrue() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(mActivity, FEEDBACK_PACKAGE);
|
||||
public void isAvailable_enableLowVisionGenericFeedbackWithValidParams_returnsTrue() {
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, PACKAGE_NAME, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.isAvailable()).isTrue();
|
||||
}
|
||||
@@ -64,15 +65,26 @@ public class FeedbackManagerTest {
|
||||
@Test
|
||||
@DisableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void isAvailable_disableLowVisionGenericFeedback_returnsFalse() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(mActivity, FEEDBACK_PACKAGE);
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, PACKAGE_NAME, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void isAvailable_withNullPackage_returnsFalse() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(mActivity, null);
|
||||
public void isAvailable_withNullCategory_returnsFalse() {
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, PACKAGE_NAME, /* category= */ null);
|
||||
|
||||
assertThat(feedbackManager.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void isAvailable_withNullReporterPackage_returnsFalse() {
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, /* reporterPackage= */ null, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.isAvailable()).isFalse();
|
||||
}
|
||||
@@ -80,40 +92,52 @@ public class FeedbackManagerTest {
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void isAvailable_withNullActivity_returnsFalse() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(null, FEEDBACK_PACKAGE);
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(/* activity= */ null, PACKAGE_NAME, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void sendFeedback_enableLowVisionGenericFeedbackWithPackageAndActivity_success() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(mActivity, FEEDBACK_PACKAGE);
|
||||
public void sendFeedback_enableLowVisionGenericFeedbackWithValidParams_success() {
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, PACKAGE_NAME, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.sendFeedback()).isTrue();
|
||||
|
||||
Intent startedIntent = Shadows.shadowOf(mActivity).getNextStartedActivity();
|
||||
assertThat(startedIntent).isNotNull();
|
||||
assertThat(startedIntent.getAction()).isEqualTo(Intent.ACTION_BUG_REPORT);
|
||||
assertThat(startedIntent.getPackage()).isEqualTo(FEEDBACK_PACKAGE);
|
||||
assertThat(startedIntent.getPackage()).isEqualTo(PACKAGE_NAME);
|
||||
Bundle extras = startedIntent.getExtras();
|
||||
assertThat(extras).isNotNull();
|
||||
assertThat(extras.getString(CATEGORY_TAG)).isEqualTo(
|
||||
ACCESSIBILITY_FEEDBACK_REQUEST_BUCKET_ID);
|
||||
assertThat(extras.getString(CATEGORY_TAG)).isEqualTo(DEFAULT_CATEGORY);
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void sendFeedback_disableLowVisionGenericFeedback_returnsFalse() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(mActivity, FEEDBACK_PACKAGE);
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, PACKAGE_NAME, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.sendFeedback()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void sendFeedback_withNullPackage_returnsFalse() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(mActivity, null);
|
||||
public void sendFeedback_withNullCategory_returnsFalse() {
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, PACKAGE_NAME, /* category= */ null);
|
||||
|
||||
assertThat(feedbackManager.sendFeedback()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void sendFeedback_withNullReporterPackage_returnsFalse() {
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(mActivity, /* reporterPackage= */ null, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.sendFeedback()).isFalse();
|
||||
}
|
||||
@@ -121,7 +145,8 @@ public class FeedbackManagerTest {
|
||||
@Test
|
||||
@EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
|
||||
public void sendFeedback_withNullActivity_returnsFalse() {
|
||||
FeedbackManager feedbackManager = new FeedbackManager(null, FEEDBACK_PACKAGE);
|
||||
FeedbackManager feedbackManager =
|
||||
new FeedbackManager(/* activity= */ null, PACKAGE_NAME, DEFAULT_CATEGORY);
|
||||
|
||||
assertThat(feedbackManager.sendFeedback()).isFalse();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user