3ac6aaf796
Separate notification and ring controllers based on the ring/volume
stream alias boolean in config.xml.
For both ring and volume controller: Not show vibrate icon when vibration is not supported on device. Show
silent icon instead.
Known issue: Add the notification volume slider only in Settings, and
not in VolumePanelDialog. When the alias is set to false and the streams
separated, the ring volume slider in VolumePanelDialog keeps its title
of "Ring & notification volume" instead of changing to "Ring volume".
Bug: b/38477228
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=SoundSettingsTest RunSettingsRoboTests
Change-Id: Id17523f49b291a5cf612b90f93c3b2ab6486c62f
104 lines
4.0 KiB
Java
104 lines
4.0 KiB
Java
/*
|
|
* Copyright (C) 2017 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.settings.notification;
|
|
|
|
import static com.google.common.truth.Truth.assertThat;
|
|
|
|
import static org.mockito.Mockito.doReturn;
|
|
import static org.mockito.Mockito.mock;
|
|
import static org.mockito.Mockito.spy;
|
|
import static org.mockito.Mockito.when;
|
|
|
|
import android.content.Context;
|
|
import android.media.AudioManager;
|
|
import android.os.UserManager;
|
|
import android.preference.SeekBarVolumizer;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.testutils.XmlTestUtils;
|
|
import com.android.settings.testutils.shadow.ShadowAudioHelper;
|
|
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
|
|
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
|
|
import com.android.settings.testutils.shadow.ShadowUserManager;
|
|
|
|
import org.junit.Ignore;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
import org.robolectric.RobolectricTestRunner;
|
|
import org.robolectric.RuntimeEnvironment;
|
|
import org.robolectric.annotation.Config;
|
|
import org.robolectric.util.ReflectionHelpers;
|
|
|
|
import java.util.List;
|
|
|
|
@RunWith(RobolectricTestRunner.class)
|
|
public class SoundSettingsTest {
|
|
|
|
@Test
|
|
@Config(shadows = {ShadowUserManager.class, ShadowAudioHelper.class, ShadowDeviceConfig.class,
|
|
ShadowBluetoothAdapter.class})
|
|
@Ignore
|
|
public void getNonIndexableKeys_existInXmlLayout() {
|
|
final Context context = spy(RuntimeEnvironment.application);
|
|
AudioManager audioManager = mock(AudioManager.class);
|
|
doReturn(audioManager).when(context).getSystemService(Context.AUDIO_SERVICE);
|
|
|
|
UserManager userManager = mock(UserManager.class);
|
|
when(userManager.isAdminUser()).thenReturn(false);
|
|
doReturn(userManager).when(context).getSystemService(Context.USER_SERVICE);
|
|
|
|
final List<String> niks =
|
|
SoundSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(context);
|
|
SoundSettings settings = new SoundSettings();
|
|
final int xmlId = settings.getPreferenceScreenResId();
|
|
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
|
|
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.zen_mode_settings));
|
|
// Add keys with hidden resources
|
|
keys.add("alarm_volume");
|
|
keys.add("ring_volume");
|
|
keys.add("notification_volume");
|
|
|
|
assertThat(keys).containsAtLeastElementsIn(niks);
|
|
}
|
|
|
|
@Test
|
|
public void onStreamValueChanged_shouldRepostStopSampleMessage() {
|
|
final SoundSettings settings = new SoundSettings();
|
|
ReflectionHelpers.setField(
|
|
settings.mVolumeCallback, "mCurrent", mock(SeekBarVolumizer.class));
|
|
|
|
settings.mVolumeCallback.onStreamValueChanged(0, 5);
|
|
|
|
assertThat(settings.mHandler.hasMessages(SoundSettings.STOP_SAMPLE)).isTrue();
|
|
}
|
|
|
|
@Test
|
|
public void notificationVolume_isBetweenRingAndAlarm() {
|
|
final Context context = spy(RuntimeEnvironment.application);
|
|
final SoundSettings settings = new SoundSettings();
|
|
final int xmlId = settings.getPreferenceScreenResId();
|
|
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
|
|
|
|
int ring = keys.indexOf("ring_volume");
|
|
int notification = keys.indexOf("notification_volume");
|
|
int alarm = keys.indexOf("alarm_volume");
|
|
|
|
assertThat(ring < notification).isTrue();
|
|
assertThat(notification < alarm).isTrue();
|
|
}
|
|
}
|