From cc7e5a7a71ecd3037802668be19935270f9c0216 Mon Sep 17 00:00:00 2001
From: Brandon Maxwell <maxwelb@google.com>
Date: Fri, 29 Jan 2016 17:03:04 -0800
Subject: Refactored dialer Ringtone code in prep for call waiting

+ Created class that is responsible for determining if a ringtone should
be played.
+ This class will also have the code to play call waiting tones

Change-Id: Ie8fb633c8a233cc6b54beeb09b3fd6b62c9cb76c
---
 .../incallui/ringtone/RingtoneManagerTest.java     | 75 ++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java

(limited to 'InCallUI/tests')

diff --git a/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java b/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java
new file mode 100644
index 000000000..768843e1c
--- /dev/null
+++ b/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2016 The Android Open Source 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
+ */
+package com.android.incallui.ringtone;
+
+import android.media.RingtoneManager;
+import android.test.AndroidTestCase;
+
+import com.android.contacts.common.compat.CompatUtils;
+import com.android.incallui.Call.State;
+
+public class RingtoneManagerTest extends AndroidTestCase {
+
+    private DialerRingtoneManager mRingtoneManager;
+
+    @Override
+    public void setUp() {
+        mRingtoneManager = new DialerRingtoneManager();
+        mRingtoneManager.forceDialerRingingEnabled();
+    }
+
+    @Override
+    public void tearDown() {
+        mRingtoneManager = null;
+    }
+
+    public void testShouldPlayRingtone_M() {
+        if (CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertFalse(mRingtoneManager.shouldPlayRingtone(0, null));
+    }
+
+    public void testShouldPlayRingtone_N_NullUri() {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertFalse(mRingtoneManager.shouldPlayRingtone(State.INCOMING, null));
+    }
+
+    public void testShouldPlayRingtone_N_NotIncoming() {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertFalse(mRingtoneManager.shouldPlayRingtone(State.ACTIVE, null));
+    }
+
+    // Specific case for call waiting since that needs its own sound
+    public void testShouldPlayRingtone_N_CallWaiting() {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertFalse(mRingtoneManager.shouldPlayRingtone(State.CALL_WAITING, null));
+    }
+
+    public void testShouldPlayRingtone_N() {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertTrue(mRingtoneManager.shouldPlayRingtone(State.INCOMING,
+                RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)));
+    }
+}
-- 
cgit v1.2.3


From 249c755441938ead47c01d27c168c4096e0d9769 Mon Sep 17 00:00:00 2001
From: Brandon Maxwell <maxwelb@google.com>
Date: Fri, 29 Jan 2016 17:49:28 -0800
Subject: Adding method to check if call waiting tone should be played

+ This method will be used in StatusBarNotifier to determine when
call waiting tones should be played instead of the standard ringtone

Change-Id: I4ad55f3870de5e63d03f4a5e8534680fa24556bd
---
 .../incallui/ringtone/RingtoneManagerTest.java     | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'InCallUI/tests')

diff --git a/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java b/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java
index 768843e1c..f94f71daa 100644
--- a/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java
+++ b/InCallUI/tests/src/com/android/incallui/ringtone/RingtoneManagerTest.java
@@ -72,4 +72,33 @@ public class RingtoneManagerTest extends AndroidTestCase {
         assertTrue(mRingtoneManager.shouldPlayRingtone(State.INCOMING,
                 RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE)));
     }
+
+    public void testShouldPlayCallWaitingTone_M() {
+        if (CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(0));
+    }
+
+    public void testShouldPlayCallWaitingTone_N_NotCallWaiting() {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(State.ACTIVE));
+    }
+
+    // Specific case for incoming since it plays its own sound
+    public void testShouldPlayCallWaitingTone_N_Incoming() {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertFalse(mRingtoneManager.shouldPlayCallWaitingTone(State.INCOMING));
+    }
+
+    public void testShouldPlayCallWaitingTone_N() {
+        if (!CompatUtils.isNCompatible()) {
+            return;
+        }
+        assertTrue(mRingtoneManager.shouldPlayCallWaitingTone(State.CALL_WAITING));
+    }
 }
-- 
cgit v1.2.3