From abf10def9f86ccbf5e1bc9f32669ef28353983c6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 15 Oct 2014 08:32:11 -0500
Subject: Remove volume text from manual test

---
 tests/manual | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/manual b/tests/manual
index f69cf14..0df4186 100644
--- a/tests/manual
+++ b/tests/manual
@@ -47,13 +47,13 @@ Test-case indicator-sound/unity8-high-volume
 		<dd>The slider should be in the middle of the scale</dd>
 	<dt>Increase the volume once using HW keys if available</dt>
 		<dd>A notification bubble should appear with the sound volume</dd>
-		<dd>The text on the notification should read "Volume"</dd>
+		<dd>There should be no text on the notification</dd>
 	<dt>Increase the volume using HW keys until it is roughly 90% of the range</dt>
 		<dd>A notification bubble should appear with the sound volume</dd>
 		<dd>The text on the notification should read "High volume"</dd>
 		<dd>The range on the notification bubble should have a different color signifying the higher volume</dd>
 	<dt>Decrease the volume using HW keys until it is roughly 50% of the range</dt>
 		<dd>A notification bubble should appear with the sound volume</dd>
-		<dd>The text on the notification should read "Volume"</dd>
+		<dd>There should be no text on the notification</dd>
 		<dd>The range on the notification bubble should have a standard color</dd>
 </dl>
-- 
cgit v1.2.3


From 33998ab08618bb6d513f91b2d49685ede072432b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 15 Oct 2014 08:35:54 -0500
Subject: Found other notification

---
 src/service.vala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/service.vala b/src/service.vala
index b4c7c44..d9a2dd3 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -179,6 +179,8 @@ public class IndicatorSound.Service: Object {
 		double v = this.volume_control.get_volume () + volume_step_percentage * delta;
 		this.volume_control.set_volume (v.clamp (0.0, this.max_volume));
 
+		/* TODO: Don't want to mess up the desktop today, but we should remove this
+		   scrolling change and merge that into volume control's notification */
 		if (this.notification != null) {
 			string icon;
 			if (v <= 0.0)
-- 
cgit v1.2.3


From 46c7d4c1cb1a6552ba205beaf233d66dcd4fc8a7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 15 Oct 2014 08:38:43 -0500
Subject: Make volume icons match the panel icons

---
 src/volume-control.vala | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/volume-control.vala b/src/volume-control.vala
index d666708..f6f54d2 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -618,11 +618,13 @@ public class VolumeControl : Object
 
 			/* Choose an icon */
 			string icon = "audio-volume-muted";
-			if (volume > 0.0 && volume <= 0.33)
+			if (volume <= 0.0)
+				icon = "audio-volume-muted";
+			else if (volume <= 0.3)
 				icon = "audio-volume-low";
-			if (volume > 0.33 && volume <= 0.66)
+			else if (volume <= 0.7)
 				icon = "audio-volume-medium";
-			if (volume > 0.66 && volume <= 1.0)
+			else
 				icon = "audio-volume-high";
 
 			/* Choose a sound */
-- 
cgit v1.2.3