Merge changes from topics "A11yFeedback", "AccessibilityFeedbackFeatureProvider" into main

* changes: feat(A11yFeedback): Pixel overlay to expose the feedback bucket ID feat(A11yFeedback): Add feedback entry for Accessibility page feat(A11yFeedback): Add FeedbackManager for Accessibility page
2025-02-16 19:45:09 -08:00
parent 2c90d30415 6b916e6f29
commit 972e7a320c
12 changed files with 480 additions and 4 deletions
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -21,7 +21,11 @@ import static com.android.internal.accessibility.common.ShortcutConstants.UserSh
 import static com.google.common.truth.Truth.assertThat;

 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;

@@ -43,6 +47,8 @@ import android.platform.test.annotations.DisableFlags;
 import android.platform.test.annotations.EnableFlags;
 import android.platform.test.flag.junit.SetFlagsRule;
 import android.provider.Settings;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.accessibility.AccessibilityManager;

 import androidx.fragment.app.Fragment;
@@ -107,13 +113,15 @@ public class AccessibilitySettingsTest {
    private static final String EMPTY_STRING = "";
    private static final String DEFAULT_SUMMARY = "default summary";
    private static final String DEFAULT_DESCRIPTION = "default description";
+    private static final String DEFAULT_CATEGORY = "default category";
    private static final String DEFAULT_LABEL = "default label";
    private static final Boolean SERVICE_ENABLED = true;
    private static final Boolean SERVICE_DISABLED = false;

    @Rule
    public final MockitoRule mocks = MockitoJUnit.rule();
-    @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
    private final Context mContext = ApplicationProvider.getApplicationContext();
    @Spy
    private final AccessibilityServiceInfo mServiceInfo = getMockAccessibilityServiceInfo(
@@ -121,7 +129,13 @@ public class AccessibilitySettingsTest {
    private ShadowAccessibilityManager mShadowAccessibilityManager;
    @Mock
    private LocalBluetoothManager mLocalBluetoothManager;
+    @Mock
+    private Menu mMenu;
+    @Mock
+    private MenuItem mMenuItem;
+
    private ActivityController<SettingsActivity> mActivityController;
+
    private AccessibilitySettings mFragment;

    @Before
@@ -438,6 +452,66 @@ public class AccessibilitySettingsTest {

    }

+    @Test
+    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void onCreateOptionsMenu_enableLowVisionGenericFeedback_shouldAddSendFeedbackMenu() {
+        setupFragment();
+        mFragment.setFeedbackManager(
+                new FeedbackManager(mFragment.getActivity(), PACKAGE_NAME, DEFAULT_CATEGORY));
+        when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
+
+        mFragment.onCreateOptionsMenu(mMenu, /* inflater= */ null);
+
+        verify(mMenu).add(anyInt(), eq(AccessibilitySettings.MENU_ID_SEND_FEEDBACK),
+                anyInt(), eq(mContext.getText(R.string.accessibility_send_feedback_title)));
+    }
+
+    @Test
+    @DisableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void onCreateOptionsMenu_disableLowVisionGenericFeedback_shouldNotAddSendFeedbackMenu() {
+        setupFragment();
+        mFragment.setFeedbackManager(
+                new FeedbackManager(mFragment.getActivity(), PACKAGE_NAME, DEFAULT_CATEGORY));
+        when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
+
+        mFragment.onCreateOptionsMenu(mMenu, /* inflater= */ null);
+
+        verify(mMenu, never()).add(anyInt(), eq(AccessibilitySettings.MENU_ID_SEND_FEEDBACK),
+                anyInt(), eq(mContext.getText(R.string.accessibility_send_feedback_title)));
+    }
+
+    @Test
+    @EnableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void onOptionsItemSelected_enableLowVisionGenericFeedback_shouldStartSendFeedback() {
+        setupFragment();
+        mFragment.setFeedbackManager(
+                new FeedbackManager(mFragment.getActivity(), PACKAGE_NAME, DEFAULT_CATEGORY));
+        when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
+        mFragment.onCreateOptionsMenu(mMenu, /* inflater= */ null);
+        when(mMenuItem.getItemId()).thenReturn(AccessibilitySettings.MENU_ID_SEND_FEEDBACK);
+
+        mFragment.onOptionsItemSelected(mMenuItem);
+
+        Intent startedIntent = shadowOf(mFragment.getActivity()).getNextStartedActivity();
+        assertThat(startedIntent).isNotNull();
+    }
+
+    @Test
+    @DisableFlags(com.android.server.accessibility.Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void onOptionsItemSelected_disableLowVisionGenericFeedback_shouldNotStartSendFeedback() {
+        setupFragment();
+        mFragment.setFeedbackManager(
+                new FeedbackManager(mFragment.getActivity(), PACKAGE_NAME, DEFAULT_CATEGORY));
+        when(mMenu.add(anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(mMenuItem);
+        mFragment.onCreateOptionsMenu(mMenu, /* inflater= */ null);
+        when(mMenuItem.getItemId()).thenReturn(AccessibilitySettings.MENU_ID_SEND_FEEDBACK);
+
+        mFragment.onOptionsItemSelected(mMenuItem);
+
+        Intent startedIntent = shadowOf(mFragment.getActivity()).getNextStartedActivity();
+        assertThat(startedIntent).isNull();
+    }
+
    @Test
    public void testAccessibilityMenuInSystem_IncludedInInteractionControl() {
        mShadowAccessibilityManager.setInstalledAccessibilityServiceList(
--- a/tests/robotests/src/com/android/settings/accessibility/FeedbackManagerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/FeedbackManagerTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.accessibility;
+
+import static com.android.settings.accessibility.FeedbackManager.CATEGORY_TAG;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
+import android.platform.test.flag.junit.SetFlagsRule;
+
+import com.android.server.accessibility.Flags;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+
+/** Tests for {@link FeedbackManager}. */
+@RunWith(RobolectricTestRunner.class)
+public class FeedbackManagerTest {
+
+    @Rule
+    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
+
+    private static final String PACKAGE_NAME = "test.feedback.package";
+    private static final String DEFAULT_CATEGORY = "default category";
+
+    private Activity mActivity;
+
+    @Before
+    public void setUp() {
+        mActivity = Robolectric.buildActivity(Activity.class).create().get();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void isAvailable_enableLowVisionGenericFeedbackWithValidParams_returnsTrue() {
+        FeedbackManager feedbackManager =
+                new FeedbackManager(mActivity, PACKAGE_NAME, DEFAULT_CATEGORY);
+
+        assertThat(feedbackManager.isAvailable()).isTrue();
+    }
+
+    @Test
+    @DisableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void isAvailable_disableLowVisionGenericFeedback_returnsFalse() {
+        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_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();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void isAvailable_withNullActivity_returnsFalse() {
+        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_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(PACKAGE_NAME);
+        Bundle extras = startedIntent.getExtras();
+        assertThat(extras).isNotNull();
+        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, PACKAGE_NAME, DEFAULT_CATEGORY);
+
+        assertThat(feedbackManager.sendFeedback()).isFalse();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    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();
+    }
+
+    @Test
+    @EnableFlags(Flags.FLAG_ENABLE_LOW_VISION_GENERIC_FEEDBACK)
+    public void sendFeedback_withNullActivity_returnsFalse() {
+        FeedbackManager feedbackManager =
+                new FeedbackManager(/* activity= */ null, PACKAGE_NAME, DEFAULT_CATEGORY);
+
+        assertThat(feedbackManager.sendFeedback()).isFalse();
+    }
+}