Settings: Use correct icon for ring volume (eeba6d55) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_audio_ring.xml

0 → 100644

+27 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!--
			Copyright (C) 2016 The CyanogenMod Project

			Licensed under the Apache License, Version 2.0 (the "License");
			you may not use this file except in compliance with the License.
			You may obtain a copy of the License at

			http://www.apache.org/licenses/LICENSE-2.0

			Unless required by applicable law or agreed to in writing, software
			distributed under the License is distributed on an "AS IS" BASIS,
			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			See the License for the specific language governing permissions and
			limitations under the License.
			-->
			<vector xmlns:android="http://schemas.android.com/apk/res/android"
			android:width="32dp"
			android:height="32dp"
			android:viewportWidth="24"
			android:viewportHeight="24"
			android:tint="?android:attr/colorControlNormal">

			<path
			android:fillColor="@android:color/black"
			android:pathData="M23.71,16.67C20.66,13.78 16.54,12 12,12 7.46,12 3.34,13.78 0.29,16.67c-0.18,0.18 -0.29,0.43 -0.29,0.71 0,0.28 0.11,0.53 0.29,0.71l2.48,2.48c0.18,0.18 0.43,0.29 0.71,0.29 0.27,0 0.52,-0.11 0.7,-0.28 0.79,-0.74 1.69,-1.36 2.66,-1.85 0.33,-0.16 0.56,-0.5 0.56,-0.9v-3.1c1.45,-0.48 3,-0.73 4.6,-0.73s3.15,0.25 4.6,0.72v3.1c0,0.39 0.23,0.74 0.56,0.9 0.98,0.49 1.87,1.12 2.66,1.85 0.18,0.18 0.43,0.28 0.7,0.28 0.28,0 0.53,-0.11 0.71,-0.29l2.48,-2.48c0.18,-0.18 0.29,-0.43 0.29,-0.71 0,-0.27 -0.11,-0.52 -0.29,-0.7zM21.16,6.26l-1.41,-1.41 -3.56,3.55 1.41,1.41s3.45,-3.52 3.56,-3.55zM13,2h-2v5h2V2zM6.4,9.81L7.81,8.4 4.26,4.84 2.84,6.26c0.11,0.03 3.56,3.55 3.56,3.55z" />
			</vector>

res/xml/sound_settings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@
	<!-- Ring volume -->		<!-- Ring volume -->
	<com.android.settings.notification.VolumeSeekBarPreference		<com.android.settings.notification.VolumeSeekBarPreference
	android:key="ring_volume"		android:key="ring_volume"
	android:icon="@*android:drawable/ic_audio_ring_notif"		android:icon="@drawable/ic_audio_ring"
	android:title="@string/ring_volume_option_title" />		android:title="@string/ring_volume_option_title" />

	<!-- Notification volume -->		<!-- Notification volume -->

src/com/android/settings/notification/NotificationVolumePreferenceController.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -63,4 +63,14 @@ public class NotificationVolumePreferenceController extends
	return com.android.internal.R.drawable.ic_audio_ring_notif_mute;		return com.android.internal.R.drawable.ic_audio_ring_notif_mute;
	}		}

			@Override
			public void updatePreferenceIcon() {
			if (mPreference != null) {
			mPreference.showIcon(mSuppressor != null
			? com.android.internal.R.drawable.ic_audio_ring_notif_mute
			: 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);
			}
			}
	}		}

src/com/android/settings/notification/RingVolumePreferenceController.java

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,7 @@ import android.os.Vibrator;
	import android.util.Log;		import android.util.Log;

	import com.android.internal.annotations.VisibleForTesting;		import com.android.internal.annotations.VisibleForTesting;
			import com.android.settings.R;
	import com.android.settings.Utils;		import com.android.settings.Utils;
	import com.android.settings.notification.VolumeSeekBarPreference.Callback;		import com.android.settings.notification.VolumeSeekBarPreference.Callback;
	import com.android.settingslib.core.lifecycle.Lifecycle;		import com.android.settingslib.core.lifecycle.Lifecycle;
	@@ -45,8 +46,8 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr

	private AudioManager mAudioManager;		private AudioManager mAudioManager;
	private Vibrator mVibrator;		private Vibrator mVibrator;
	private int mRingerMode = -1;		protected int mRingerMode = -1;
	private ComponentName mSuppressor;		protected ComponentName mSuppressor;
	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 AudioHelper mHelper;		private AudioHelper mHelper;
	@@ -109,7 +110,7 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
	updatePreferenceIcon();		updatePreferenceIcon();
	}		}

	private boolean wasRingerModeVibrate() {		public boolean wasRingerModeVibrate() {
	return mVibrator != null && mRingerMode == AudioManager.RINGER_MODE_SILENT		return mVibrator != null && mRingerMode == AudioManager.RINGER_MODE_SILENT
	&& mAudioManager.getLastAudibleStreamVolume(AudioManager.STREAM_RING) == 0;		&& mAudioManager.getLastAudibleStreamVolume(AudioManager.STREAM_RING) == 0;
	}		}
	@@ -125,13 +126,13 @@ public class RingVolumePreferenceController extends VolumeSeekBarPreferenceContr
	updatePreferenceIcon();		updatePreferenceIcon();
	}		}

	private void updatePreferenceIcon() {		public void updatePreferenceIcon() {
	if (mPreference != null) {		if (mPreference != null) {
	mPreference.showIcon(mSuppressor != null		mPreference.showIcon(mSuppressor != null
	? com.android.internal.R.drawable.ic_audio_ring_notif_mute		? com.android.internal.R.drawable.ic_audio_ring_notif_mute
	: mRingerMode == AudioManager.RINGER_MODE_VIBRATE \|\| wasRingerModeVibrate()		: 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_vibrate
	: com.android.internal.R.drawable.ic_audio_ring_notif);		: R.drawable.ic_audio_ring);
	}		}
	}		}