PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Fix inconsistent ringtone keyword search" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-11-29 03:27:08 +00:00
committed by Android (Google) Code Review
parent 8a97245b3d 409e5f5697
commit 8ff5f0cfc5
2 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/notification/PhoneRingtonePreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.notification;
import android.content.Context;
import android.media.RingtoneManager;
import android.media.audio.Flags;
import com.android.settings.Utils;
@@ -36,6 +37,9 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
@Override
public boolean isAvailable() {
if (isRingtoneVibrationEnabled()) {
return false;
}
return Utils.isVoiceCapable(mContext);
}
@@ -43,4 +47,9 @@ public class PhoneRingtonePreferenceController extends RingtonePreferenceControl
public int getRingtoneType() {
return RingtoneManager.TYPE_RINGTONE;
}
private boolean isRingtoneVibrationEnabled() {
return Flags.enableRingtoneHapticsCustomization() && mContext.getResources().getBoolean(
com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported);
}
}

46
tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
View File

@@ -21,17 +21,22 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
import android.media.RingtoneManager;
import android.media.audio.Flags;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.telephony.TelephonyManager;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class)
public class PhoneRingtonePreferenceControllerTest {
@@ -39,32 +44,59 @@ public class PhoneRingtonePreferenceControllerTest {
@Mock
private TelephonyManager mTelephonyManager;
private Context mContext;
@Mock
private Context mMockContext;
@Mock
private Resources mMockResources;
private PhoneRingtonePreferenceController mController;
@Rule
public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowContext = ShadowApplication.getInstance();
shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
mContext = RuntimeEnvironment.application;
mController = new PhoneRingtonePreferenceController(mContext);
when(mMockContext.getResources()).thenReturn(mMockResources);
when(mMockContext.getSystemService(
Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
mController = new PhoneRingtonePreferenceController(mMockContext);
}
@Test
@DisableFlags(Flags.FLAG_ENABLE_RINGTONE_HAPTICS_CUSTOMIZATION)
public void isAvailable_notVoiceCapable_shouldReturnFalse() {
when(mMockResources
.getBoolean(com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported))
.thenReturn(false);
when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
@DisableFlags(Flags.FLAG_ENABLE_RINGTONE_HAPTICS_CUSTOMIZATION)
public void isAvailable_VoiceCapable_shouldReturnTrue() {
when(mMockResources
.getBoolean(com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported))
.thenReturn(false);
when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
@EnableFlags(Flags.FLAG_ENABLE_RINGTONE_HAPTICS_CUSTOMIZATION)
public void isAvailable_vibrationSupported_shouldReturnFalse() {
when(mMockResources
.getBoolean(com.android.internal.R.bool.config_ringtoneVibrationSettingsSupported))
.thenReturn(true);
when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void getRingtoneType_shouldReturnRingtone() {
assertThat(mController.getRingtoneType()).isEqualTo(RingtoneManager.TYPE_RINGTONE);