Merge "Update sound settings icons" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2e0709b3b8
@@ -55,6 +55,6 @@ public class MediaVolumePreferenceController extends
|
||||
|
||||
@Override
|
||||
public int getMuteIcon() {
|
||||
return com.android.internal.R.drawable.ic_audio_media_mute;
|
||||
return R.drawable.ic_media_stream_off;
|
||||
}
|
||||
}
|
||||
|
@@ -56,7 +56,7 @@ public class NotificationVolumePreferenceController extends
|
||||
|
||||
@Override
|
||||
public int getMuteIcon() {
|
||||
return com.android.internal.R.drawable.ic_audio_ring_notif_mute;
|
||||
return R.drawable.ic_notifications_off_24dp;
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -126,12 +126,12 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
|
||||
if (mPreference != null) {
|
||||
if (mRingerMode == AudioManager.RINGER_MODE_VIBRATE) {
|
||||
mMuteIcon = R.drawable.ic_volume_ringer_vibrate;
|
||||
mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
|
||||
mPreference.showIcon(R.drawable.ic_volume_ringer_vibrate);
|
||||
} else if (mRingerMode == AudioManager.RINGER_MODE_SILENT) {
|
||||
mMuteIcon = R.drawable.ic_notifications_off_24dp;
|
||||
mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif_mute);
|
||||
mPreference.showIcon(R.drawable.ic_notifications_off_24dp);
|
||||
} else {
|
||||
mPreference.showIcon(com.android.internal.R.drawable.ic_audio_ring_notif);
|
||||
mPreference.showIcon(R.drawable.ic_notifications);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user