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

Commit 99d0b5a4 authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge changes from topics "A11yFeedback0P", "SurveyFeatureProvider_isSurveyAvailable" into main 

* changes:
  Revert "Add controller for magnification feedback preference"
  Revert "Add HaTS entrypoint for Magnification page"
  feat(A11yHaTS): Add entrypoint for force invert
  feat(A11yHaTS): Simply survey logic into menu controller
  feat(A11yFeedback): Add feedback entry for framework accessibility
parents 4320d48f e1b0eb25

res/values/strings.xml

+2 −6
Original line number Diff line number Diff line
@@ -5232,14 +5232,10 @@ 
    <string name="accessibility_tap_assistance_title">Timing controls</string>

    <!-- Title for the accessibility system controls page. [CHAR LIMIT=50] -->

    <string name="accessibility_system_controls_title">System controls</string>

    <!-- Title for the accessibility feedback preference. [CHAR LIMIT=50] -->

    <string name="accessibility_feedback_title">Feedback</string>

    <!-- Summary for the accessibility feedback preference. [CHAR LIMIT=100] -->

    <string name="accessibility_feedback_summary">Help improve by taking a survey</string>

    <!-- Summary for the accessibility feedback preference is disabled. [CHAR LIMIT=100] -->

    <string name="accessibility_feedback_disabled_summary">No surveys available</string>

    <!-- The menu item to start the feedback process for the accessibility [CHAR LIMIT=30] -->

    <string name="accessibility_send_feedback_title">Send feedback</string>

    <!-- The menu item to start the survey process for the accessibility [CHAR LIMIT=30] -->

    <string name="accessibility_send_survey_title">Rate us</string>

    <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->

    <string name="user_installed_services_category_title">Downloaded apps</string>

    <!-- Title for the accessibility preference category of settings considered to be experimental, meaning they might be changed or removed in the future. [CHAR LIMIT=50] -->

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

+1 −2
Original line number Diff line number Diff line
@@ -19,13 +19,12 @@ package com.android.settings.accessibility; 
import android.app.settings.SettingsEnums;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.search.SearchIndexable;



/** Settings fragment containing accessibility control timeout preference. */

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public final class AccessibilityControlTimeoutPreferenceFragment extends DashboardFragment {

public final class AccessibilityControlTimeoutPreferenceFragment extends BaseSupportFragment {



    static final String TAG = "AccessibilityControlTimeoutPreferenceFragment";

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

+1 −4
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ import com.android.internal.accessibility.util.AccessibilityUtils; 
import com.android.internal.content.PackageMonitor;

import com.android.settings.R;

import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;

import com.android.settings.accessibility.actionbar.FeedbackMenuController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.RestrictedPreference;
@@ -58,7 +56,7 @@ import java.util.Map; 


/** Activity with the accessibility settings. */

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class AccessibilitySettings extends DashboardFragment implements

public class AccessibilitySettings extends BaseSupportFragment implements

        InputManager.InputDeviceListener {



    private static final String TAG = "AccessibilitySettings";
@@ -210,7 +208,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
        mNeedPreferencesUpdate = false;

        registerContentMonitors();

        registerInputDeviceListener();

        FeedbackMenuController.init(this, SettingsEnums.ACCESSIBILITY);

    }



    @Override

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

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.internal.accessibility.common.ShortcutConstants; 
import com.android.internal.accessibility.util.ShortcutUtils;

import com.android.settings.R;

import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment;

import com.android.settings.dashboard.RestrictedDashboardFragment;



import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -55,7 +54,7 @@ import java.util.Set; 
/**

 * Base class for accessibility fragments shortcut functions and dialog management.

 */

public abstract class AccessibilityShortcutPreferenceFragment extends RestrictedDashboardFragment

public abstract class AccessibilityShortcutPreferenceFragment extends BaseRestrictedSupportFragment

        implements ShortcutPreference.OnClickCallback {

    private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";

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

+1 −2
Original line number Diff line number Diff line
@@ -19,13 +19,12 @@ package com.android.settings.accessibility; 
import android.app.settings.SettingsEnums;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.search.SearchIndexable;



/** Accessibility settings for audio adjustment. */

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class AudioAdjustmentFragment extends DashboardFragment {

public class AudioAdjustmentFragment extends BaseSupportFragment {



    private static final String TAG = "AudioAdjustmentFragment";