Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove Dream Overlay window name and update content descriptions." into tm-qpr-dev

Browse Source
This commit is contained in:
Bryce Lee
2023-02-14 22:12:03 +00:00
committed by Android (Google) Code Review
parent 22530aa35b 3ecdb1e111
commit 69dcdb2d3c
3 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/res/values/strings.xml
View File

@@ -2842,4 +2842,19 @@
[CHAR LIMIT=32] [CHAR LIMIT=32]
--> -->
<string name="lock_screen_settings">Lock screen settings</string> <string name="lock_screen_settings">Lock screen settings</string>
<!-- Content description for Wi-Fi not available icon on dream [CHAR LIMIT=NONE]-->
<string name="wifi_unavailable_dream_overlay_content_description">Wi-Fi not available</string>
<!-- Content description for camera blocked icon on dream [CHAR LIMIT=NONE] -->
<string name="camera_blocked_dream_overlay_content_description">Camera blocked</string>
<!-- Content description for camera and microphone blocked icon on dream [CHAR LIMIT=NONE] -->
<string name="camera_and_microphone_blocked_dream_overlay_content_description">Camera and microphone blocked</string>
<!-- Content description for camera and microphone disabled icon on dream [CHAR LIMIT=NONE] -->
<string name="microphone_blocked_dream_overlay_content_description">Microphone blocked</string>
<!-- Content description for priority mode icon on dream [CHAR LIMIT=NONE] -->
<string name="priority_mode_dream_overlay_content_description">Priority mode on</string>
</resources> </resources>

2
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java
View File

@@ -243,6 +243,8 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ
*/ */
private void addOverlayWindowLocked(WindowManager.LayoutParams layoutParams) { private void addOverlayWindowLocked(WindowManager.LayoutParams layoutParams) {
mWindow = new PhoneWindow(mContext); mWindow = new PhoneWindow(mContext);
// Default to SystemUI name for TalkBack.
mWindow.setTitle("");
mWindow.setAttributes(layoutParams); mWindow.setAttributes(layoutParams);
mWindow.setWindowManager(null, layoutParams.token, "DreamOverlay", true); mWindow.setWindowManager(null, layoutParams.token, "DreamOverlay", true);

20
packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java
View File

@@ -257,7 +257,8 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve
mConnectivityManager.getActiveNetwork()); mConnectivityManager.getActiveNetwork());
final boolean available = capabilities != null final boolean available = capabilities != null
&& capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI); && capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI);
showIcon(DreamOverlayStatusBarView.STATUS_ICON_WIFI_UNAVAILABLE, !available); showIcon(DreamOverlayStatusBarView.STATUS_ICON_WIFI_UNAVAILABLE, !available,
R.string.wifi_unavailable_dream_overlay_content_description);
} }
private void updateAlarmStatusIcon() { private void updateAlarmStatusIcon() {
@@ -294,13 +295,16 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve
@DreamOverlayStatusBarView.StatusIconType int iconType = Resources.ID_NULL; @DreamOverlayStatusBarView.StatusIconType int iconType = Resources.ID_NULL;
showIcon( showIcon(
DreamOverlayStatusBarView.STATUS_ICON_CAMERA_DISABLED, DreamOverlayStatusBarView.STATUS_ICON_CAMERA_DISABLED,
!micBlocked && cameraBlocked); !micBlocked && cameraBlocked,
R.string.camera_blocked_dream_overlay_content_description);
showIcon( showIcon(
DreamOverlayStatusBarView.STATUS_ICON_MIC_DISABLED, DreamOverlayStatusBarView.STATUS_ICON_MIC_DISABLED,
micBlocked && !cameraBlocked); micBlocked && !cameraBlocked,
R.string.microphone_blocked_dream_overlay_content_description);
showIcon( showIcon(
DreamOverlayStatusBarView.STATUS_ICON_MIC_CAMERA_DISABLED, DreamOverlayStatusBarView.STATUS_ICON_MIC_CAMERA_DISABLED,
micBlocked && cameraBlocked); micBlocked && cameraBlocked,
R.string.camera_and_microphone_blocked_dream_overlay_content_description);
} }
private String buildNotificationsContentDescription(int notificationCount) { private String buildNotificationsContentDescription(int notificationCount) {
@@ -313,11 +317,13 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve
private void updatePriorityModeStatusIcon() { private void updatePriorityModeStatusIcon() {
showIcon( showIcon(
DreamOverlayStatusBarView.STATUS_ICON_PRIORITY_MODE_ON, DreamOverlayStatusBarView.STATUS_ICON_PRIORITY_MODE_ON,
mZenModeController.getZen() != Settings.Global.ZEN_MODE_OFF); mZenModeController.getZen() != Settings.Global.ZEN_MODE_OFF,
R.string.priority_mode_dream_overlay_content_description);
} }
private void showIcon(@DreamOverlayStatusBarView.StatusIconType int iconType, boolean show) { private void showIcon(@DreamOverlayStatusBarView.StatusIconType int iconType, boolean show,
showIcon(iconType, show, null); int contentDescriptionResId) {
showIcon(iconType, show, mResources.getString(contentDescriptionResId));
} }
private void showIcon( private void showIcon(