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

Commit 8035d404 authored by Victor Truong's avatar Victor Truong Committed by Automerger Merge Worker
Browse files

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

Merge "Fix blocked sensor chip to hide if settings change." into tm-qpr-dev am: 2b708c99 am: 2761a05c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19457539



Change-Id: Ie185c8120e64a873571427ce353f49a88150c450
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c5f64f47 2761a05c

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStatusBarViewController.java

+9 −10
Original line number Diff line number Diff line
@@ -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) {