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

Merge "Merge pointer/tts categories into one without heading" into oc-dev am: 4f4fe03a6e

Browse Source 
am: 98ec71355b

Change-Id: I02004dde71686322f76c181da0991bd58161d8ab
This commit is contained in:
Fan Zhang
2017-04-28 02:29:27 +00:00
committed by android-build-merger
parent 72b505869f 98ec71355b
commit b763f04b1e
5 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
View File

@@ -38,9 +38,7 @@ import java.util.List;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -94,7 +92,7 @@ public class TtsPreferenceControllerTest {
mController.displayPreference(mScreen);
// Remove both category and preference.
verify(mScreen, times(2)).removePreference(any(Preference.class));
// Remove preference.
verify(mScreen).removePreference(any(Preference.class));
}
}

2
tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
View File

@@ -125,7 +125,7 @@ public class BaseSearchIndexProviderTest {
"key_user_dictionary_settings", "gesture_settings_category", "gesture_assist",
"gesture_swipe_down_fingerprint", "gesture_double_tap_power",
"gesture_double_twist", "gesture_double_tap_screen", "gesture_pick_up",
"pointer_settings_category", "pointer_speed", "voice_category", "tts_settings",
"pointer_speed", "tts_settings",
"game_controller_settings_category", "vibrate_input_devices");
}