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

Merge "DO NOT MERGE Show mute icon in sound settings page" into pi-dev

Browse Source 
am: 69ec1673df

Change-Id: I825f94150e349465d4dd9168ab18d8f03fc9ed73
This commit is contained in:
Beverly
2018-05-15 14:58:21 -07:00
committed by android-build-merger
parent baadcabd04 69ec1673df
commit 7f53974cbd
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
package com.android.settings.notification;
import android.app.NotificationManager;
import android.arch.lifecycle.LifecycleObserver;
import android.arch.lifecycle.OnLifecycleEvent;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -47,6 +46,8 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
private final RingReceiver mReceiver = new RingReceiver();
private final H mHandler = new H();
private int mMuteIcon;
public RingVolumePreferenceController(Context context) {
this(context, KEY_RING_VOLUME);
}
@@ -94,7 +95,7 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
@Override
public int getMuteIcon() {
return R.drawable.ic_volume_ringer_vibrate;
return mMuteIcon;
}
private void updateRingerMode() {
@@ -104,11 +105,6 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
updatePreferenceIcon();
}
private boolean wasRingerModeVibrate() {
return mVibrator != null && mRingerMode == AudioManager.RINGER_MODE_SILENT
&& mHelper.getLastAudibleStreamVolume(getAudioStream()) == 0;
}
private void updateEffectsSuppressor() {
final ComponentName suppressor = NotificationManager.from(mContext).getEffectsSuppressor();
if (Objects.equals(suppressor, mSuppressor)) return;
@@ -122,10 +118,15 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
private void updatePreferenceIcon() {
if (mPreference != null) {
mPreference.showIcon(
mRingerMode == AudioManager.RINGER_MODE_VIBRATE || wasRingerModeVibrate()
? com.android.internal.R.drawable.ic_audio_ring_notif_vibrate
: com.android.internal.R.drawable.ic_audio_ring_notif);
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);
} 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);
}
}
}