de08eaf437
- when we adjust the sound volme in Sound settings, we only re-post the stop sample message when we receive the onSampleStarting callback. However, if we change the volume while a sample is still playing, onSampleStarting will not be called as it's already started. This results in shortened sample duration, which in extreme case, the new sample will not be played at all if the new volume change is made almost towards the end of the previous sample period. So, everytime user change the volume, we should re-post the stop sample message, so that the sample playing duration would be extended properly. - also removed the original calls to the onStreamValueChanged() during init, as the original implementation is empty, and during init, we do not need any handling to start/stop the sample. Change-Id: I9f35ddfb6d809eeb83b1a732a09362286ff6ed77 Fixes: 77514234 Test: make RunSettingsRoboTests
85 lines
3.2 KiB
Java
85 lines
3.2 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.Handler;
|
|
import android.os.UserManager;
|
|
|
|
import android.preference.SeekBarVolumizer;
|
|
import com.android.settings.R;
|
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
|
import com.android.settings.testutils.XmlTestUtils;
|
|
import com.android.settings.testutils.shadow.ShadowAudioHelper;
|
|
import com.android.settings.testutils.shadow.ShadowUserManager;
|
|
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
import org.robolectric.RuntimeEnvironment;
|
|
import org.robolectric.annotation.Config;
|
|
import org.robolectric.util.ReflectionHelpers;
|
|
|
|
import java.util.List;
|
|
|
|
@RunWith(SettingsRobolectricTestRunner.class)
|
|
public class SoundSettingsTest {
|
|
|
|
@Test
|
|
@Config(shadows = {ShadowUserManager.class, ShadowAudioHelper.class})
|
|
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).containsAllIn(niks);
|
|
}
|
|
|
|
@Test
|
|
public void onStreamValueChanged_shouldRepostStopSampleMessage() {
|
|
final SoundSettings settings = new SoundSettings();
|
|
final Handler handler = settings.mHandler;
|
|
ReflectionHelpers.setField(
|
|
settings.mVolumeCallback, "mCurrent", mock(SeekBarVolumizer.class));
|
|
|
|
settings.mVolumeCallback.onStreamValueChanged(0, 5);
|
|
|
|
assertThat(settings.mHandler.hasMessages(SoundSettings.STOP_SAMPLE)).isTrue();
|
|
}
|
|
}
|