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

Commit 2761a05c 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 am: 2b708c99 

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



Change-Id: Ibd3a186752e514ab2a8b194a101486d25b9a18f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b446de75 2b708c99

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) {