Merge "Fix blocked sensor chip to hide if settings change." into tm-qpr-dev

This commit is contained in:
Victor Truong
2022-08-08 15:27:50 +00:00
committed by Android (Google) Code Review

View File

@@ -215,16 +215,15 @@ public class DreamOverlayStatusBarViewController extends ViewController<DreamOve
final boolean cameraBlocked = mSensorPrivacyController
.isSensorBlocked(SensorPrivacyManager.Sensors.CAMERA);
@DreamOverlayStatusBarView.StatusIconType int iconType = Resources.ID_NULL;
if (micBlocked && cameraBlocked) {
iconType = DreamOverlayStatusBarView.STATUS_ICON_MIC_CAMERA_DISABLED;
} else if (!micBlocked && cameraBlocked) {
iconType = DreamOverlayStatusBarView.STATUS_ICON_CAMERA_DISABLED;
} else if (micBlocked && !cameraBlocked) {
iconType = DreamOverlayStatusBarView.STATUS_ICON_MIC_DISABLED;
}
if (iconType != Resources.ID_NULL) {
showIcon(iconType, true);
}
showIcon(
DreamOverlayStatusBarView.STATUS_ICON_CAMERA_DISABLED,
!micBlocked && cameraBlocked);
showIcon(
DreamOverlayStatusBarView.STATUS_ICON_MIC_DISABLED,
micBlocked && !cameraBlocked);
showIcon(
DreamOverlayStatusBarView.STATUS_ICON_MIC_CAMERA_DISABLED,
micBlocked && cameraBlocked);
}
private String buildNotificationsContentDescription(int notificationCount) {