diff --git a/res/values/strings.xml b/res/values/strings.xml index 9842843c9cd..bbba1cf6e17 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5500,10 +5500,6 @@ screen magnification on app transitions Power button ends call - - Large mouse pointer - - Make the mouse pointer more noticeable Make more apps dark diff --git a/res/xml/accessibility_color_and_motion.xml b/res/xml/accessibility_color_and_motion.xml index 9cc8f8b9bc7..1c27aaa5b81 100644 --- a/res/xml/accessibility_color_and_motion.xml +++ b/res/xml/accessibility_color_and_motion.xml @@ -58,13 +58,6 @@ android:title="@string/accessibility_disable_animations" settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/> - - mShortcutFeatureKeys = new ArrayList<>(); @@ -116,9 +114,6 @@ public class ColorAndMotionFragment extends DashboardFragment { // Disable animation. mToggleDisableAnimationsPreference = findPreference(RemoveAnimationsPreference.KEY); - - // Large pointer icon. - mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON); } /** @@ -134,10 +129,8 @@ public class ColorAndMotionFragment extends DashboardFragment { // hardware-accelerated color transform. getPreferenceScreen().removePreference(mDisplayDaltonizerPreferenceScreen); getPreferenceScreen().removePreference(mToggleDisableAnimationsPreference); - getPreferenceScreen().removePreference(mToggleLargePointerIconPreference); experimentalCategory.addPreference(mDisplayDaltonizerPreferenceScreen); experimentalCategory.addPreference(mToggleDisableAnimationsPreference); - experimentalCategory.addPreference(mToggleLargePointerIconPreference); } } diff --git a/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java b/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java deleted file mode 100644 index 0f1d44d81d5..00000000000 --- a/src/com/android/settings/accessibility/LargePointerIconPreferenceController.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2019 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.content.Context; -import android.provider.Settings; - -import androidx.annotation.VisibleForTesting; - -import com.android.settings.R; -import com.android.settings.core.TogglePreferenceController; - -public class LargePointerIconPreferenceController extends TogglePreferenceController { - - @VisibleForTesting - static final int ON = 1; - @VisibleForTesting - static final int OFF = 0; - - public LargePointerIconPreferenceController(Context context, String preferenceKey) { - super(context, preferenceKey); - } - - @Override - public boolean isChecked() { - return Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, OFF) != OFF; - } - - @Override - public boolean setChecked(boolean isChecked) { - return Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, isChecked ? ON : OFF); - } - - @Override - public int getAvailabilityStatus() { - return android.view.flags.Flags.enableVectorCursorA11ySettings() ? CONDITIONALLY_UNAVAILABLE - : AVAILABLE; - } - - @Override - public int getSliceHighlightMenuRes() { - return R.string.menu_key_accessibility; - } -} diff --git a/tests/unit/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java deleted file mode 100644 index fbc1a199d66..00000000000 --- a/tests/unit/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (C) 2020 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 android.view.flags.Flags.FLAG_ENABLE_VECTOR_CURSOR_A11Y_SETTINGS; - -import static com.android.settings.accessibility.LargePointerIconPreferenceController.OFF; -import static com.android.settings.accessibility.LargePointerIconPreferenceController.ON; - -import static com.google.common.truth.Truth.assertThat; - -import android.content.Context; -import android.platform.test.annotations.RequiresFlagsDisabled; -import android.platform.test.annotations.RequiresFlagsEnabled; -import android.platform.test.flag.junit.CheckFlagsRule; -import android.platform.test.flag.junit.DeviceFlagsValueProvider; -import android.provider.Settings; - -import androidx.preference.SwitchPreference; -import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import com.android.settings.core.BasePreferenceController; - -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(AndroidJUnit4.class) -public class LargePointerIconPreferenceControllerTest { - - @Rule - public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); - - private static final int UNKNOWN = -1; - - private Context mContext; - private SwitchPreference mPreference; - private LargePointerIconPreferenceController mController; - - @Before - public void setUp() { - mContext = ApplicationProvider.getApplicationContext(); - mPreference = new SwitchPreference(mContext); - mController = new LargePointerIconPreferenceController(mContext, "large_pointer"); - } - - @Test - @RequiresFlagsDisabled(FLAG_ENABLE_VECTOR_CURSOR_A11Y_SETTINGS) - public void getAvailabilityStatus_shouldReturnAvailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - - @Test - @RequiresFlagsEnabled(FLAG_ENABLE_VECTOR_CURSOR_A11Y_SETTINGS) - public void getAvailabilityStatus_shouldReturnConditionallyUnavailable() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE); - } - - @Test - public void isChecked_enabledLargePointer_shouldReturnTrue() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, ON); - - mController.updateState(mPreference); - - assertThat(mController.isChecked()).isTrue(); - assertThat(mPreference.isChecked()).isTrue(); - } - - @Test - public void isChecked_disabledLargePointer_shouldReturnFalse() { - Settings.Secure.putInt(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, OFF); - - mController.updateState(mPreference); - - assertThat(mController.isChecked()).isFalse(); - assertThat(mPreference.isChecked()).isFalse(); - } - - @Test - public void setChecked_enabled_shouldEnableLargePointer() { - mController.setChecked(true); - - assertThat(Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(ON); - } - - @Test - public void setChecked_disabled_shouldDisableLargePointer() { - mController.setChecked(false); - - assertThat(Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(OFF); - } -}