Introduce boolean flags to show/hide items for Language & input.
This adds seven new boolean flags: config_show_phone_language config_show_virtual_keyboard_pref config_show_physical_keyboard_pref config_show_spellcheckers_settings config_show_tts_settings_summary config_show_pointer_speed config_show_vibrate_input_devices Which when individually set to false, will hide the item from "Language & input" in System. It will also hide them from surfacing in search results. Bug: 62379555 Test: Individual controller tests are all updated. Change-Id: I9ef1c3037b0bec6ffa5a627006507f4f16e534c4
This commit is contained in:
@@ -18,6 +18,7 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -34,6 +35,7 @@ import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -44,18 +46,18 @@ import java.util.List;
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class GameControllerPreferenceControllerTest {
|
||||
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private InputManager mInputManager;
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private InputDevice mInputDevice;
|
||||
|
||||
private Context mContext;
|
||||
private GameControllerPreferenceController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getSystemService(Context.INPUT_SERVICE)).thenReturn(mInputManager);
|
||||
mController = new GameControllerPreferenceController(mContext);
|
||||
}
|
||||
@@ -110,6 +112,14 @@ public class GameControllerPreferenceControllerTest {
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(qualifiers = "mcc999")
|
||||
public void testIsAvailable_ifDisabled_shouldReturnFalse() {
|
||||
mController = new GameControllerPreferenceController(mContext);
|
||||
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateNonIndexableKeys_shouldIncludeCategoryAndPrefKeys() {
|
||||
when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
|
||||
|
@@ -18,6 +18,7 @@ package com.android.settings.inputmethod;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -37,6 +38,7 @@ 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)
|
||||
@@ -65,10 +67,22 @@ public class PhysicalKeyboardPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldAlwaysBeAvailable() {
|
||||
public void testPhysicalKeyboard_byDefault_shouldBeShown() {
|
||||
final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
|
||||
mController = new PhysicalKeyboardPreferenceController(context, null);
|
||||
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(qualifiers = "mcc999")
|
||||
public void testPhysicalKeyboard_ifDisabled_shouldNotBeShown() {
|
||||
final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
|
||||
mController = new PhysicalKeyboardPreferenceController(context, null);
|
||||
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(shadows = {
|
||||
ShadowInputDevice.class,
|
||||
|
@@ -16,7 +16,10 @@
|
||||
|
||||
package com.android.settings.inputmethod;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.Resources;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.view.textservice.SpellCheckerInfo;
|
||||
import android.view.textservice.TextServicesManager;
|
||||
@@ -46,6 +49,9 @@ public class SpellCheckerPreferenceControllerTest {
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private TextServicesManager mTextServicesManager;
|
||||
@Mock
|
||||
private Resources mResources;
|
||||
|
||||
private Context mAppContext;
|
||||
private Preference mPreference;
|
||||
private SpellCheckerPreferenceController mController;
|
||||
@@ -56,10 +62,23 @@ public class SpellCheckerPreferenceControllerTest {
|
||||
mAppContext = RuntimeEnvironment.application;
|
||||
when(mContext.getSystemService(Context.TEXT_SERVICES_MANAGER_SERVICE))
|
||||
.thenReturn(mTextServicesManager);
|
||||
when(mContext.getResources()).thenReturn(mResources);
|
||||
when(mResources.getBoolean(R.bool.config_show_spellcheckers_settings)).thenReturn(true);
|
||||
mPreference = new Preference(mAppContext);
|
||||
mController = new SpellCheckerPreferenceController(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSpellChecker_byDefault_shouldBeShown() {
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSpellChecker_ifDisabled_shouldNotBeShown() {
|
||||
when(mResources.getBoolean(R.bool.config_show_spellcheckers_settings)).thenReturn(false);
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_NoSpellerChecker_shouldSetSummaryToDefault() {
|
||||
when(mTextServicesManager.isSpellCheckerEnabled()).thenReturn(true);
|
||||
|
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -75,10 +76,20 @@ public class VirtualKeyboardPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void shouldAlwaysBeAvailable() {
|
||||
public void testVirtualKeyboard_byDefault_shouldBeShown() {
|
||||
final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
|
||||
mController = new VirtualKeyboardPreferenceController(context);
|
||||
assertThat(mController.isAvailable()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(qualifiers = "mcc999")
|
||||
public void testVirtualKeyboard_ifDisabled_shouldNotBeShown() {
|
||||
final Context context = spy(RuntimeEnvironment.application.getApplicationContext());
|
||||
mController = new VirtualKeyboardPreferenceController(context);
|
||||
assertThat(mController.isAvailable()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateState_noEnabledIMEs_setEmptySummary() {
|
||||
mController.updateState(mPreference);
|
||||
|
Reference in New Issue
Block a user