PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I206b788c8985b7ebc20093275ed4d1c272349e82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Amy Hsu
2022-09-20 09:03:38 +00:00
committed by Automerger Merge Worker
parent e6901aedba c799cb11f5
commit b13a190ef7
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2985,6 +2985,8 @@
<string name="screen_resolution_summary_highest">1440p QHD+</string> <string name="screen_resolution_summary_highest">1440p QHD+</string>
<!-- The footer message for switch screen resolution [CHAR LIMIT=NONE] --> <!-- 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> <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] --> <!-- Display settings screen, Color mode settings title [CHAR LIMIT=30] -->
<string name="color_mode_title">Colors</string> <string name="color_mode_title">Colors</string>

12
src/com/android/settings/display/ScreenResolutionFragment.java
View File

@@ -29,6 +29,8 @@ import android.hardware.display.DisplayManager;
import android.provider.Settings; import android.provider.Settings;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.Display; import android.view.Display;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -65,6 +67,7 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {
private IllustrationPreference mImagePreference; private IllustrationPreference mImagePreference;
private DisplayObserver mDisplayObserver; private DisplayObserver mDisplayObserver;
private AccessibilityManager mAccessibilityManager;
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
@@ -72,6 +75,7 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {
mDefaultDisplay = mDefaultDisplay =
context.getSystemService(DisplayManager.class).getDisplay(Display.DEFAULT_DISPLAY); context.getSystemService(DisplayManager.class).getDisplay(Display.DEFAULT_DISPLAY);
mAccessibilityManager = context.getSystemService(AccessibilityManager.class);
mResources = context.getResources(); mResources = context.getResources();
mScreenResolutionOptions = mScreenResolutionOptions =
mResources.getStringArray(R.array.config_screen_resolution_options_strings); mResources.getStringArray(R.array.config_screen_resolution_options_strings);
@@ -215,6 +219,14 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {
if (!mDisplayObserver.setPendingResolutionChange(selectedWidth)) { if (!mDisplayObserver.setPendingResolutionChange(selectedWidth)) {
return; 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); super.onRadioButtonClicked(selected);
} }