Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Separate mute and vibrate icons in status bar" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-13 13:21:36 +00:00
committed by Android (Google) Code Review
parent 77222e8ea9 ca7ceb8aef
commit 8e741727cc
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,8 @@ public class PhoneStatusBarPolicy
private final String mSlotBluetooth; private final String mSlotBluetooth;
private final String mSlotTty; private final String mSlotTty;
private final String mSlotZen; private final String mSlotZen;
private final String mSlotVolume; private final String mSlotMute;
private final String mSlotVibrate;
private final String mSlotAlarmClock; private final String mSlotAlarmClock;
private final String mSlotManagedProfile; private final String mSlotManagedProfile;
private final String mSlotRotate; private final String mSlotRotate;
@@ -149,7 +150,8 @@ public class PhoneStatusBarPolicy
private final PrivacyLogger mPrivacyLogger; private final PrivacyLogger mPrivacyLogger;
private boolean mZenVisible; private boolean mZenVisible;
private boolean mVolumeVisible; private boolean mVibrateVisible;
private boolean mMuteVisible;
private boolean mCurrentUserSetup; private boolean mCurrentUserSetup;
private boolean mManagedProfileIconVisible = false; private boolean mManagedProfileIconVisible = false;
@@ -207,7 +209,8 @@ public class PhoneStatusBarPolicy
mSlotBluetooth = resources.getString(com.android.internal.R.string.status_bar_bluetooth); mSlotBluetooth = resources.getString(com.android.internal.R.string.status_bar_bluetooth);
mSlotTty = resources.getString(com.android.internal.R.string.status_bar_tty); mSlotTty = resources.getString(com.android.internal.R.string.status_bar_tty);
mSlotZen = resources.getString(com.android.internal.R.string.status_bar_zen); mSlotZen = resources.getString(com.android.internal.R.string.status_bar_zen);
mSlotVolume = resources.getString(com.android.internal.R.string.status_bar_volume); mSlotMute = resources.getString(com.android.internal.R.string.status_bar_mute);
mSlotVibrate = resources.getString(com.android.internal.R.string.status_bar_volume);
mSlotAlarmClock = resources.getString(com.android.internal.R.string.status_bar_alarm_clock); mSlotAlarmClock = resources.getString(com.android.internal.R.string.status_bar_alarm_clock);
mSlotManagedProfile = resources.getString( mSlotManagedProfile = resources.getString(
com.android.internal.R.string.status_bar_managed_profile); com.android.internal.R.string.status_bar_managed_profile);
@@ -264,9 +267,14 @@ public class PhoneStatusBarPolicy
mIconController.setIcon(mSlotZen, R.drawable.stat_sys_dnd, null); mIconController.setIcon(mSlotZen, R.drawable.stat_sys_dnd, null);
mIconController.setIconVisibility(mSlotZen, false); mIconController.setIconVisibility(mSlotZen, false);
// volume // vibrate
mIconController.setIcon(mSlotVolume, R.drawable.stat_sys_ringer_vibrate, null); mIconController.setIcon(mSlotVibrate, R.drawable.stat_sys_ringer_vibrate,
mIconController.setIconVisibility(mSlotVolume, false); mResources.getString(R.string.accessibility_ringer_vibrate));
mIconController.setIconVisibility(mSlotVibrate, false);
// mute
mIconController.setIcon(mSlotMute, R.drawable.stat_sys_ringer_silent,
mResources.getString(R.string.accessibility_ringer_silent));
mIconController.setIconVisibility(mSlotMute, false);
updateVolumeZen(); updateVolumeZen();
// cast // cast
@@ -372,9 +380,8 @@ public class PhoneStatusBarPolicy
int zenIconId = 0; int zenIconId = 0;
String zenDescription = null; String zenDescription = null;
boolean volumeVisible = false; boolean vibrateVisible = false;
int volumeIconId = 0; boolean muteVisible = false;
String volumeDescription = null;
int zen = mZenController.getZen(); int zen = mZenController.getZen();
if (DndTile.isVisible(mSharedPreferences) || DndTile.isCombinedIcon(mSharedPreferences)) { if (DndTile.isVisible(mSharedPreferences) || DndTile.isCombinedIcon(mSharedPreferences)) {
@@ -396,13 +403,9 @@ public class PhoneStatusBarPolicy
mRingerModeTracker.getRingerModeInternal().getValue(); mRingerModeTracker.getRingerModeInternal().getValue();
if (ringerModeInternal != null) { if (ringerModeInternal != null) {
if (ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) { if (ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) {
volumeVisible = true; vibrateVisible = true;
volumeIconId = R.drawable.stat_sys_ringer_vibrate;
volumeDescription = mResources.getString(R.string.accessibility_ringer_vibrate);
} else if (ringerModeInternal == AudioManager.RINGER_MODE_SILENT) { } else if (ringerModeInternal == AudioManager.RINGER_MODE_SILENT) {
volumeVisible = true; muteVisible = true;
volumeIconId = R.drawable.stat_sys_ringer_silent;
volumeDescription = mResources.getString(R.string.accessibility_ringer_silent);
} }
} }
} }
@@ -415,13 +418,16 @@ public class PhoneStatusBarPolicy
mZenVisible = zenVisible; mZenVisible = zenVisible;
} }
if (volumeVisible) { if (vibrateVisible != mVibrateVisible) {
mIconController.setIcon(mSlotVolume, volumeIconId, volumeDescription); mIconController.setIconVisibility(mSlotVibrate, vibrateVisible);
mVibrateVisible = vibrateVisible;
} }
if (volumeVisible != mVolumeVisible) {
mIconController.setIconVisibility(mSlotVolume, volumeVisible); if (muteVisible != mMuteVisible) {
mVolumeVisible = volumeVisible; mIconController.setIconVisibility(mSlotMute, muteVisible);
mMuteVisible = muteVisible;
} }
updateAlarm(); updateAlarm();
} }