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

Commit ab9a73ff authored by Amy Hsu's avatar Amy Hsu Committed by Automerger Merge Worker
Browse files

Merge "[RRS] Send event to AccessibilityManager when an unselect radio button... 

Merge "[RRS] Send event to AccessibilityManager when an unselect radio button is selected." into tm-d1-dev am: c799cb11 am: d4341004 am: 4da27ff2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19893206



Change-Id: Id9493be0c48bcc3e31272fc0dd0f155a18161fa2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db0a0792 4da27ff2

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -2435,6 +2435,8 @@ 
    <string name="screen_resolution_summary_highest">1440p QHD+</string>

    <!-- The footer message for switch screen resolution [CHAR LIMIT=NONE] -->

    <string name="screen_resolution_footer">Full resolution uses more of your battery. Switching your resolution may cause some apps to restart.</string>

    <!-- Message announced to a11y users when they selected one resolution [CHAR LIMIT=NONE] -->

    <string name="screen_resolution_selected_a11y">Selected</string>









    <!-- Display settings screen, Color mode settings title [CHAR LIMIT=30] -->









    <string name="color_mode_title">Colors</string>
































src/com/android/settings/display/ScreenResolutionFragment.java



+12
−0






























Original line number
Diff line number
Diff line







@@ -29,6 +29,8 @@ import android.hardware.display.DisplayManager;







import android.provider.Settings;









import android.text.TextUtils;









import android.view.Display;









import android.view.accessibility.AccessibilityEvent;









import android.view.accessibility.AccessibilityManager;



















import androidx.annotation.VisibleForTesting;









import androidx.preference.PreferenceScreen;








@@ -65,6 +67,7 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {

















    private IllustrationPreference mImagePreference;









    private DisplayObserver mDisplayObserver;









    private AccessibilityManager mAccessibilityManager;



















    @Override









    public void onAttach(Context context) {








@@ -72,6 +75,7 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {

















        mDefaultDisplay =









                context.getSystemService(DisplayManager.class).getDisplay(Display.DEFAULT_DISPLAY);









        mAccessibilityManager = context.getSystemService(AccessibilityManager.class);









        mResources = context.getResources();









        mScreenResolutionOptions =









                mResources.getStringArray(R.array.config_screen_resolution_options_strings);








@@ -215,6 +219,14 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {







        if (!mDisplayObserver.setPendingResolutionChange(selectedWidth)) {









            return;









        }



















        if (mAccessibilityManager.isEnabled()) {









            AccessibilityEvent event = AccessibilityEvent.obtain();









            event.setEventType(AccessibilityEvent.TYPE_ANNOUNCEMENT);









            event.getText().add(mResources.getString(R.string.screen_resolution_selected_a11y));









            mAccessibilityManager.sendAccessibilityEvent(event);









        }



















        super.onRadioButtonClicked(selected);









    }