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

Merge "Update sound settings icons" into pi-dev am: 2e0709b3b8

Browse Source 
am: 75ffd61ee3

Change-Id: I60c903d44a89e09eadd469d67d6351efcb2b9721
This commit is contained in:
Antony Sargent
2018-05-24 23:50:12 -07:00
committed by android-build-merger
parent 493847ea8e 75ffd61ee3
commit 97e418f45c
5 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/notification/MediaVolumePreferenceController.java
View File

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

2
src/com/android/settings/notification/NotificationVolumePreferenceController.java
View File

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

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

@@ -127,12 +127,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);
}
}
}