Merge "Add call volume in sound settings" into pi-dev am: b46389a588

am: 71b333f162

Change-Id: If69203fa5c4158f609484e6c3bbc0ca5bd6e0f58
This commit is contained in:
Ryan Lin
2018-05-11 15:44:53 -07:00
committed by android-build-merger
10 changed files with 219 additions and 19 deletions

View File

@@ -0,0 +1,95 @@
/*
* Copyright (C) 2018 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.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.media.AudioManager;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAudioManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAudioManager.class})
public class CallVolumePreferenceControllerTest {
private static final String TEST_KEY = "Test_Key";
@Mock
private AudioHelper mHelper;
private Context mContext;
private CallVolumePreferenceController mController;
private ShadowAudioManager mShadowAudioManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new CallVolumePreferenceController(mContext, TEST_KEY);
mController.setAudioHelper(mHelper);
mShadowAudioManager = ShadowAudioManager.getShadow();
}
@Test
public void getAvailabilityStatus_singleVolume_shouldReturnDisable() {
when(mHelper.isSingleVolume()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
public void getAvailabilityStatus_notSingleVolume_shouldReturnAvailable() {
when(mHelper.isSingleVolume()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void getMuteIcon_shouldEqualToOriginalIcon() {
assertThat(mController.getMuteIcon()).isEqualTo(R.drawable.ic_local_phone_24_lib);
}
@Test
public void getAudioStream_onBluetoothScoOff_shouldEqualToStreamVoiceCall() {
mShadowAudioManager.setBluetoothScoOn(false);
assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_VOICE_CALL);
}
@Test
public void getAudioStream_onBluetoothScoOn_shouldEqualToStreamBtSco() {
mShadowAudioManager.setBluetoothScoOn(true);
assertThat(mController.getAudioStream()).isEqualTo(AudioManager.STREAM_BLUETOOTH_SCO);
}
}

View File

@@ -50,17 +50,20 @@ public class VolumeSeekBarPreferenceTest {
}
@Test
public void setStream_shouldSetMaxAndProgress() {
public void setStream_shouldSetMinMaxAndProgress() {
final int stream = 5;
final int max = 17;
final int min = 1;
final int progress = 4;
when(mAudioManager.getStreamMaxVolume(stream)).thenReturn(max);
when(mAudioManager.getStreamMinVolumeInt(stream)).thenReturn(min);
when(mAudioManager.getStreamVolume(stream)).thenReturn(progress);
doCallRealMethod().when(mPreference).setStream(anyInt());
mPreference.setStream(stream);
verify(mPreference).setMax(max);
verify(mPreference).setMin(min);
verify(mPreference).setProgress(progress);
}
}

View File

@@ -42,7 +42,8 @@ import java.util.ArrayList;
public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManager {
private int mRingerMode;
private int mDeviceCodes;
private boolean mMusicActiveRemotely = false;
private boolean mMusicActiveRemotely;
private boolean mBluetoothScoOn;
private ArrayList<AudioDeviceCallback> mDeviceCallbacks = new ArrayList();
@Implementation
@@ -104,4 +105,11 @@ public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManag
public void reset() {
mDeviceCallbacks.clear();
}
public void setBluetoothScoOn(boolean bluetoothScoOn) {
mBluetoothScoOn = bluetoothScoOn;
}
@Implementation
public boolean isBluetoothScoOn() { return mBluetoothScoOn; }
}