PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show mute icon in sound settings page"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-15 23:13:34 +00:00
committed by Android (Google) Code Review
parent a9ce0e9463 2aa4e12145
commit b976044f57
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/notification/RingVolumePreferenceController.java
View File

@@ -47,6 +47,8 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
private final RingReceiver mReceiver = new RingReceiver(); private final RingReceiver mReceiver = new RingReceiver();
private final H mHandler = new H(); private final H mHandler = new H();
private int mMuteIcon;
public RingVolumePreferenceController(Context context) { public RingVolumePreferenceController(Context context) {
this(context, KEY_RING_VOLUME); this(context, KEY_RING_VOLUME);
} }
@@ -94,7 +96,7 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
@Override @Override
public int getMuteIcon() { public int getMuteIcon() {
return R.drawable.ic_volume_ringer_vibrate; return mMuteIcon;
} }
private void updateRingerMode() { private void updateRingerMode() {
@@ -104,11 +106,6 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
updatePreferenceIcon(); updatePreferenceIcon();
} }
private boolean wasRingerModeVibrate() {
return mVibrator != null && mRingerMode == AudioManager.RINGER_MODE_SILENT
&& mHelper.getLastAudibleStreamVolume(getAudioStream()) == 0;
}
private void updateEffectsSuppressor() { private void updateEffectsSuppressor() {
final ComponentName suppressor = NotificationManager.from(mContext).getEffectsSuppressor(); final ComponentName suppressor = NotificationManager.from(mContext).getEffectsSuppressor();
if (Objects.equals(suppressor, mSuppressor)) return; if (Objects.equals(suppressor, mSuppressor)) return;
@@ -122,10 +119,15 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
private void updatePreferenceIcon() { private void updatePreferenceIcon() {
if (mPreference != null) { if (mPreference != null) {
mPreference.showIcon( if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {
mRingerMode == AudioManager.RINGER_MODE_VIBRATE || wasRingerModeVibrate() mMuteIcon = R.drawable.ic_volume_ringer_vibrate;
? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
: com.android.internal.R.drawable.ic_audio_ring_notif); } else if (mRingerMode == AudioManager.RINGER_MODE_SILENT) {
mMuteIcon = R.drawable.ic_volume_ringer_mute;
mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_mute);
} else {
mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif);
}
} }
} }