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

Commit 1597fbf4 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Change description of privacy icons in Statusbar" into rvc-qpr-dev am:... 

Merge "Change description of privacy icons in Statusbar" into rvc-qpr-dev am: 6bace95e am: 3ba41889

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

Change-Id: Ided15c932a3f5ad46ee93aba31bbf272fd0a41c3
parents 1dc22266 3ba41889

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+11 −2
Original line number Diff line number Diff line
@@ -284,13 +284,22 @@ public class PhoneStatusBarPolicy 
                mResources.getString(R.string.accessibility_data_saver_on));

        mIconController.setIconVisibility(mSlotDataSaver, false);





        // privacy items

        String microphoneString = mResources.getString(PrivacyType.TYPE_MICROPHONE.getNameId());

        String microphoneDesc = mResources.getString(

                R.string.ongoing_privacy_chip_content_multiple_apps, microphoneString);

        mIconController.setIcon(mSlotMicrophone, PrivacyType.TYPE_MICROPHONE.getIconId(),

                mResources.getString(PrivacyType.TYPE_MICROPHONE.getNameId()));

                microphoneDesc);

        mIconController.setIconVisibility(mSlotMicrophone, false);



        String cameraString = mResources.getString(PrivacyType.TYPE_CAMERA.getNameId());

        String cameraDesc = mResources.getString(

                R.string.ongoing_privacy_chip_content_multiple_apps, cameraString);

        mIconController.setIcon(mSlotCamera, PrivacyType.TYPE_CAMERA.getIconId(),

                mResources.getString(PrivacyType.TYPE_CAMERA.getNameId()));

                cameraDesc);

        mIconController.setIconVisibility(mSlotCamera, false);



        mIconController.setIcon(mSlotLocation, LOCATION_STATUS_ICON_ID,

                mResources.getString(R.string.accessibility_location_active));

        mIconController.setIconVisibility(mSlotLocation, false);