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

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

Change-Id: I6289dfe3795a497ea30e99b38e3e32b8ac1c9c4d
This commit is contained in:
Fabian Kozynski
2020-08-11 14:22:05 +00:00
committed by Automerger Merge Worker

View File

@@ -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);