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

Commit 9ffca7cb authored by Menghan Li's avatar Menghan Li
Browse files

feat(A11yFeedback): Add feedback entry for downloaded Accessibility 

This entry point allows users to access in the action bar.
Visibility is controlled by the aconfig and FeedbackManager#isAvailable

Bug: 393980229
Test: Manual testing on Pixel and non-Pixel devices
Test: atest ToggleFeaturePreferenceFragmentTest
Flag: com.android.server.accessibility.enable_low_vision_generic_feedback
Change-Id: Ie6dfb6a887fe5a894622e86bab39878f8adea758
parent bcddc529

src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment { 
                .getAccessibilityMetricsFeatureProvider()

                .getDownloadedFeatureMetricsCategory(componentName);

        extras.putInt(AccessibilitySettings.EXTRA_METRICS_CATEGORY, metricsCategory);

        extras.putInt(AccessibilitySettings.EXTRA_FEEDBACK_CATEGORY, metricsCategory);

        extras.putParcelable(AccessibilitySettings.EXTRA_COMPONENT_NAME, componentName);

        extras.putInt(AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES, info.getAnimatedImageRes());

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ public class AccessibilitySettings extends DashboardFragment implements 
    static final String EXTRA_HTML_DESCRIPTION = "html_description";

    static final String EXTRA_TIME_FOR_LOGGING = "start_time_to_log_a11y_tool";

    static final String EXTRA_METRICS_CATEGORY = "metrics_category";

    static final String EXTRA_FEEDBACK_CATEGORY = "feedback_category";



    // Timeout before we update the services if packages are added/removed

    // since the AccessibilityManagerService has to do that processing first

src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,11 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature 
        return getArguments().getInt(AccessibilitySettings.EXTRA_METRICS_CATEGORY);

    }



    @Override

    public int getFeedbackCategory() {

        return getArguments().getInt(AccessibilitySettings.EXTRA_FEEDBACK_CATEGORY);

    }



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

src/com/android/settings/accessibility/RestrictedPreferenceHelper.java

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ public class RestrictedPreferenceHelper { 
        extras.putInt(AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES, imageRes);

        extras.putString(AccessibilitySettings.EXTRA_HTML_DESCRIPTION, htmlDescription);

        extras.putInt(AccessibilitySettings.EXTRA_METRICS_CATEGORY, metricsCategory);

        extras.putInt(AccessibilitySettings.EXTRA_FEEDBACK_CATEGORY, metricsCategory);

    }



    /**

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
        return getArguments().getInt(AccessibilitySettings.EXTRA_METRICS_CATEGORY);

    }



    @Override

    public int getFeedbackCategory() {

        return getArguments().getInt(AccessibilitySettings.EXTRA_FEEDBACK_CATEGORY);

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);