Remove Language and Input duplicates

Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Merge for: ag/2098173/

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: I8bc0776131fcac5a6edf7e8271bc53252c2fc719
This commit is contained in:
Matthew Fritze
2017-04-11 16:35:48 -07:00
parent 803f0c96e8
commit 742467ec9f
32 changed files with 259 additions and 90 deletions

View File

@@ -47,11 +47,13 @@ public class PIckupGesturePreferenceControllerTest {
private PickupGesturePreferenceController mController;
private static final String KEY_PICK_UP = "gesture_pick_up";
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new PickupGesturePreferenceController(
mContext, null, mAmbientDisplayConfiguration, 0);
mContext, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
}
@Test