diff --git a/res/xml/accessibility_turn_screen_darker.xml b/res/xml/accessibility_turn_screen_darker.xml deleted file mode 100644 index d87f23bf2bb..00000000000 --- a/res/xml/accessibility_turn_screen_darker.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 6b629acaeac..fb1564cb6cb 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -84,10 +84,6 @@ public class AccessibilitySettings extends DashboardFragment { CATEGORY_INTERACTION_CONTROL, CATEGORY_DOWNLOADED_SERVICES }; - // Preferences - private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN = - "magnification_preference_screen"; - // Extras passed to sub-fragments. static final String EXTRA_PREFERENCE_KEY = "preference_key"; static final String EXTRA_CHECKED = "checked"; @@ -155,19 +151,6 @@ public class AccessibilitySettings extends DashboardFragment { private final Map mPreBundledServiceComponentToCategoryMap = new ArrayMap<>(); - private Preference mDisplayMagnificationPreferenceScreen; - - /** - * Check if the color transforms are color accelerated. Some transforms are experimental only - * on non-accelerated platforms due to the performance implications. - * - * @param context The current context - */ - public static boolean isColorTransformAccelerated(Context context) { - return context.getResources() - .getBoolean(com.android.internal.R.bool.config_setColorTransformAccelerated); - } - public AccessibilitySettings() { // Observe changes to anything that the shortcut can toggle, so we can reflect updates final Collection features = @@ -305,10 +288,6 @@ public class AccessibilitySettings extends DashboardFragment { PreferenceCategory prefCategory = findPreference(CATEGORIES[i]); mCategoryToPrefCategoryMap.put(CATEGORIES[i], prefCategory); } - - // Display magnification. - mDisplayMagnificationPreferenceScreen = findPreference( - DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN); } private void updateAllPreferences() { @@ -501,6 +480,7 @@ public class AccessibilitySettings extends DashboardFragment { * installed accessibility services * @return The list of {@link RestrictedPreference} */ + @VisibleForTesting List createAccessibilityServicePreferenceList( List installedServices) { @@ -566,6 +546,7 @@ public class AccessibilitySettings extends DashboardFragment { * installed accessibility shortcuts * @return The list of {@link RestrictedPreference} */ + @VisibleForTesting List createAccessibilityActivityPreferenceList( List installedShortcuts) { final Set enabledServices = diff --git a/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java b/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java deleted file mode 100644 index 0e0a6007a85..00000000000 --- a/src/com/android/settings/accessibility/TurnScreenDarkerFragment.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2021 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.settings.accessibility; - -import android.app.settings.SettingsEnums; -import android.content.Context; -import android.hardware.display.ColorDisplayManager; -import android.os.Bundle; -import android.provider.Settings; - -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; - -import com.android.settings.R; -import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.display.DarkUIPreferenceController; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.search.SearchIndexable; - -/** Accessibility settings for turning screen darker. */ -@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) -public class TurnScreenDarkerFragment extends DashboardFragment { - - private static final String TAG = "TurnDarkerFragment"; - - private static final String CATEGORY_EXPERIMENTAL = "experimental_category"; - - // Preferences - private static final String TOGGLE_INVERSION_PREFERENCE = "toggle_inversion_preference"; - private static final String DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN = - "reduce_bright_colors_preference"; - - private Preference mToggleInversionPreference; - private Preference mReduceBrightColorsPreference; - - @Override - public int getMetricsCategory() { - return SettingsEnums.ACCESSIBILITY_TURN_SCREEN_DARKER; - } - - - @Override - public void onCreate(Bundle icicle) { - super.onCreate(icicle); - initializeAllPreferences(); - updateSystemPreferences(); - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - use(DarkUIPreferenceController.class).setParentFragment(this); - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.accessibility_turn_screen_darker; - } - - @Override - protected String getLogTag() { - return TAG; - } - - private void initializeAllPreferences() { - // Display inversion. - mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE); - - // Reduce brightness. - mReduceBrightColorsPreference = - findPreference(DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN); - } - - /** - * Updates preferences related to system configurations. - */ - private void updateSystemPreferences() { - final PreferenceCategory experimentalCategory = getPreferenceScreen().findPreference( - CATEGORY_EXPERIMENTAL); - if (ColorDisplayManager.isColorTransformAccelerated(getContext())) { - mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary( - getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED)); - getPreferenceScreen().removePreference(experimentalCategory); - } else { - // Move following preferences to experimental category if device don't supports HWC - // hardware-accelerated color transform. - getPreferenceScreen().removePreference(mToggleInversionPreference); - getPreferenceScreen().removePreference(mReduceBrightColorsPreference); - experimentalCategory.addPreference(mToggleInversionPreference); - experimentalCategory.addPreference(mReduceBrightColorsPreference); - } - } - - public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider(R.xml.accessibility_turn_screen_darker); -} diff --git a/tests/robotests/src/com/android/settings/accessibility/TurnScreenDarkerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/TurnScreenDarkerFragmentTest.java deleted file mode 100644 index f2562011709..00000000000 --- a/tests/robotests/src/com/android/settings/accessibility/TurnScreenDarkerFragmentTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (C) 2021 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.settings.accessibility; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.Context; - -import androidx.test.core.app.ApplicationProvider; - -import com.android.settings.R; -import com.android.settings.testutils.XmlTestUtils; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; - -import java.util.List; - -/** Tests for {@link TurnScreenDarkerFragment}. */ -@RunWith(RobolectricTestRunner.class) -public class TurnScreenDarkerFragmentTest { - - private Context mContext = ApplicationProvider.getApplicationContext(); - - @Test - public void getNonIndexableKeys_existInXmlLayout() { - final List niks = TurnScreenDarkerFragment.SEARCH_INDEX_DATA_PROVIDER - .getNonIndexableKeys(mContext); - final List keys = - XmlTestUtils.getKeysFromPreferenceXml(mContext, - R.xml.accessibility_turn_screen_darker); - - assertThat(keys).containsAtLeastElementsIn(niks); - } -}