From 463c9a07f04a10209f9010590e79603762aa8677 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 16 Feb 2018 22:23:03 +0000 Subject: [PATCH 1/2] Revert "Add ability to show/hide accessibility_shortcut_preference." This reverts commit 4983dc1227dd3fd0c5b70ca397bdb287884478dc. Reason for revert: Moving logic somewhere else. Change-Id: I2f2e3ac6545e8599de32afb1fe6f6d108601e37d --- res/values/bools.xml | 3 - .../accessibility/AccessibilitySettings.java | 19 +---- tests/robotests/res/values-mcc999/config.xml | 1 - .../AccessibilityShortcutController.java | 42 ---------- .../AccessibilitySettingsTest.java | 78 ++----------------- 5 files changed, 7 insertions(+), 136 deletions(-) delete mode 100644 tests/robotests/src/com/android/internal/accessibility/AccessibilityShortcutController.java diff --git a/res/values/bools.xml b/res/values/bools.xml index f20b93c0675..1089fba5654 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -156,9 +156,6 @@ true - - true - true diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index bd6322527d1..ef3eb2750cc 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -33,7 +33,6 @@ import android.os.UserHandle; import android.os.Vibrator; import android.provider.SearchIndexableResource; import android.provider.Settings; -import android.support.annotation.VisibleForTesting; import android.support.v14.preference.SwitchPreference; import android.support.v4.content.ContextCompat; import android.support.v7.preference.ListPreference; @@ -104,6 +103,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements "toggle_master_mono"; private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE = "select_long_press_timeout_preference"; + private static final String ACCESSIBILITY_SHORTCUT_PREFERENCE = + "accessibility_shortcut_preference"; private static final String CAPTIONING_PREFERENCE_SCREEN = "captioning_preference_screen"; private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN = @@ -121,8 +122,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements "toggle_inversion_preference"; @VisibleForTesting static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference_screen"; - @VisibleForTesting static final String ACCESSIBILITY_SHORTCUT_PREFERENCE = - "accessibility_shortcut_preference"; // Extras passed to sub-fragments. static final String EXTRA_PREFERENCE_KEY = "preference_key"; @@ -683,7 +682,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements updateAutoclickSummary(mAutoclickPreferenceScreen); updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen); - checkAccessibilityShortcutVisibility(mAccessibilityShortcutPreferenceScreen); } private void updateMagnificationSummary(Preference pref) { @@ -818,13 +816,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } } - @VisibleForTesting void checkAccessibilityShortcutVisibility(Preference preference) { - if (!getContext().getResources().getBoolean( - R.bool.config_show_accessibility_shortcut_preference)) { - removePreference(ACCESSIBILITY_SHORTCUT_PREFERENCE); - } - } - private static void configureMagnificationPreferenceIfNeeded(Preference preference) { // Some devices support only a single magnification mode. In these cases, we redirect to // the magnification mode's UI directly, rather than showing a PreferenceScreen with a @@ -860,12 +851,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements keys.add(FONT_SIZE_PREFERENCE_SCREEN); keys.add(KEY_DISPLAY_SIZE); - // Remove Accessibility Shortcuts if it's not visible - if (!context.getResources().getBoolean( - R.bool.config_show_accessibility_shortcut_preference)) { - keys.add(ACCESSIBILITY_SHORTCUT_PREFERENCE); - } - // Duplicates in Language & Input keys.add(TTS_SETTINGS_PREFERENCE); diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index 01bfa51b03e..606a74010c4 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -47,7 +47,6 @@ false false false - false false false false diff --git a/tests/robotests/src/com/android/internal/accessibility/AccessibilityShortcutController.java b/tests/robotests/src/com/android/internal/accessibility/AccessibilityShortcutController.java deleted file mode 100644 index aae2f8d866d..00000000000 --- a/tests/robotests/src/com/android/internal/accessibility/AccessibilityShortcutController.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (C) 2017 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.internal.accessibility; - -import android.content.ComponentName; - -import java.util.HashMap; -import java.util.Map; - -/** - * Fake controller to make robolectric test compile. Should be removed when Robolectric supports - * API 25. - */ -public class AccessibilityShortcutController { - - public static Map - getFrameworkShortcutFeaturesMap() { - return new HashMap<>(); - } - - public static class ToggleableFrameworkFeatureInfo { - private String mSettingKey; - - public String getSettingKey() { - return mSettingKey; - } - } -} diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 96ce18381a7..c853c7fe402 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -16,106 +16,38 @@ package com.android.settings.accessibility; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - import android.content.Context; -import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.testutils.XmlTestUtils; - -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; +import static com.google.common.truth.Truth.assertThat; + @RunWith(SettingsRobolectricTestRunner.class) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) public class AccessibilitySettingsTest { - private Context mContext; - private AccessibilitySettings mFragment; - private boolean mAccessibilityShortcutPreferenceRemoved; - private boolean mColorInversionPreferenceRemoved; - private boolean mColorCorrectionPreferenceRemoved; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application); - mFragment = new AccessibilitySettings() { - @Override - public Context getContext() { - return mContext; - } - - @Override - protected boolean removePreference(String key) { - if (AccessibilitySettings.ACCESSIBILITY_SHORTCUT_PREFERENCE.equals(key)) { - mAccessibilityShortcutPreferenceRemoved = true; - return true; - } - - if (AccessibilitySettings.TOGGLE_INVERSION_PREFERENCE.equals(key)) { - mColorInversionPreferenceRemoved = true; - return true; - } - - if (AccessibilitySettings.DISPLAY_DALTONIZER_PREFERENCE_SCREEN.equals(key)) { - mColorCorrectionPreferenceRemoved = true; - return true; - } - return false; - } - }; - } - @Test public void testNonIndexableKeys_existInXmlLayout() { + final Context context = RuntimeEnvironment.application; final List niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(mContext); + .getNonIndexableKeys(context); final List keys = new ArrayList<>(); - keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings)); + keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings)); assertThat(keys).containsAllIn(niks); } - @Test - public void testAccessibilityShortcutPreference_byDefault_shouldBeShown() { - final Preference preference = new Preference(mContext); - mFragment.checkAccessibilityShortcutVisibility(preference); - - assertThat(mAccessibilityShortcutPreferenceRemoved).isFalse(); - } - - @Test - @Config(qualifiers = "mcc999") - public void testAccessibilityShortcutPreference_ifDisabled_shouldNotBeShown() { - final Preference preference = new Preference(mContext); - mFragment.checkAccessibilityShortcutVisibility(preference); - - assertThat(mAccessibilityShortcutPreferenceRemoved).isTrue(); - } - - @Test - @Config(qualifiers = "mcc999") - public void testNonIndexableKeys_ifAccessibilityShortcutNotVisible_containsKey() { - final List niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(mContext); - - assertThat(niks).contains(AccessibilitySettings.ACCESSIBILITY_SHORTCUT_PREFERENCE); - } - @Test public void testColorInversionPreference_byDefault_shouldBeShown() { final Preference preference = new Preference(mContext); From c64531bbce99d0d093fd351b39ad59943dce0ea1 Mon Sep 17 00:00:00 2001 From: Ben Lin Date: Fri, 16 Feb 2018 22:14:59 +0000 Subject: [PATCH 2/2] Revert "Add ability to show/hide Color Correction and Color Inversion." This reverts commit f1346930bc18530940e464b4eb772d7717763a40. Reason for revert: Moving logic elsewhere. Change-Id: Ia07b3f4c33e0078e8f35c69d5ed51daf197ff165 --- res/values/bools.xml | 6 ---- .../accessibility/AccessibilitySettings.java | 23 ++----------- tests/robotests/res/values-mcc999/config.xml | 2 -- .../AccessibilitySettingsTest.java | 34 ------------------- 4 files changed, 3 insertions(+), 62 deletions(-) diff --git a/res/values/bools.xml b/res/values/bools.xml index 1089fba5654..4665f2eaed9 100644 --- a/res/values/bools.xml +++ b/res/values/bools.xml @@ -150,12 +150,6 @@ true - - true - - - true - true diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index ef3eb2750cc..2292ca2b274 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -92,6 +92,8 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements // Preferences private static final String TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE = "toggle_high_text_contrast_preference"; + private static final String TOGGLE_INVERSION_PREFERENCE = + "toggle_inversion_preference"; private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE = "toggle_power_button_ends_call_preference"; private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE = @@ -117,10 +119,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements "autoclick_preference_screen"; private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen"; - - @VisibleForTesting static final String TOGGLE_INVERSION_PREFERENCE = - "toggle_inversion_preference"; - @VisibleForTesting static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = + private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference_screen"; // Extras passed to sub-fragments. @@ -626,8 +625,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements displayCategory.addPreference(mToggleInversionPreference); displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen); } - checkColorCorrectionVisibility(mDisplayDaltonizerPreferenceScreen); - checkColorInversionVisibility(mToggleInversionPreference); // Text contrast. mToggleHighTextContrastPreference.setChecked( @@ -802,20 +799,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } } - @VisibleForTesting void checkColorCorrectionVisibility(Preference preference) { - if (!getContext().getResources().getBoolean( - R.bool.config_show_color_correction_preference)) { - removePreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN); - } - } - - @VisibleForTesting void checkColorInversionVisibility(Preference preference) { - if (!getContext().getResources().getBoolean( - R.bool.config_show_color_inversion_preference)) { - removePreference(TOGGLE_INVERSION_PREFERENCE); - } - } - private static void configureMagnificationPreferenceIfNeeded(Preference preference) { // Some devices support only a single magnification mode. In these cases, we redirect to // the magnification mode's UI directly, rather than showing a PreferenceScreen with a diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml index 606a74010c4..788c593d2a2 100644 --- a/tests/robotests/res/values-mcc999/config.xml +++ b/tests/robotests/res/values-mcc999/config.xml @@ -54,8 +54,6 @@ false false false - false - false false false false diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index c853c7fe402..fb32da11ccd 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -47,38 +47,4 @@ public class AccessibilitySettingsTest { assertThat(keys).containsAllIn(niks); } - - @Test - public void testColorInversionPreference_byDefault_shouldBeShown() { - final Preference preference = new Preference(mContext); - mFragment.checkColorInversionVisibility(preference); - - assertThat(mColorInversionPreferenceRemoved).isEqualTo(false); - } - - @Test - @Config(qualifiers = "mcc999") - public void testColorInversionPreference_ifDisabled_shouldNotBeShown() { - final Preference preference = new Preference(mContext); - mFragment.checkColorInversionVisibility(preference); - - assertThat(mColorInversionPreferenceRemoved).isEqualTo(true); - } - - @Test - public void testColorCorrectionPreference_byDefault_shouldBeShown() { - final Preference preference = new Preference(mContext); - mFragment.checkColorCorrectionVisibility(preference); - - assertThat(mColorCorrectionPreferenceRemoved).isEqualTo(false); - } - - @Test - @Config(qualifiers = "mcc999") - public void testColorCorrectionPreference_ifDisabled_shouldNotBeShown() { - final Preference preference = new Preference(mContext); - mFragment.checkColorCorrectionVisibility(preference); - - assertThat(mColorCorrectionPreferenceRemoved).isEqualTo(true); - } }