Merge "Separate large pointer preference controller from accessibility" (9b1cf314) · Commits · e / os / android_packages_apps_Settings

res/xml/accessibility_settings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,8 @@

		<SwitchPreference
		android:key="toggle_large_pointer_icon"
		android:title="@string/accessibility_toggle_large_pointer_icon_title"/>
		android:title="@string/accessibility_toggle_large_pointer_icon_title"
		settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>

		<SwitchPreference
		android:key="toggle_disable_animations"

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −15

Original line number	Diff line number	Diff line
		@@ -321,9 +321,6 @@ public class AccessibilitySettings extends DashboardFragment implements
		} else if (mTogglePowerButtonEndsCallPreference == preference) {
		handleTogglePowerButtonEndsCallPreferenceClick();
		return true;
		} else if (mToggleLargePointerIconPreference == preference) {
		handleToggleLargePointerIconPreferenceClick();
		return true;
		} else if (mToggleMasterMonoPreference == preference) {
		handleToggleMasterMonoPreferenceClick();
		return true;
		@@ -381,12 +378,6 @@ public class AccessibilitySettings extends DashboardFragment implements
		: Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_SCREEN_OFF));
		}

		private void handleToggleLargePointerIconPreferenceClick() {
		Settings.Secure.putInt(getContentResolver(),
		Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,
		mToggleLargePointerIconPreference.isChecked() ? 1 : 0);
		}

		private void handleToggleMasterMonoPreferenceClick() {
		Settings.System.putIntForUser(getContentResolver(), Settings.System.MASTER_MONO,
		mToggleMasterMonoPreference.isChecked() ? 1 : 0, UserHandle.USER_CURRENT);
		@@ -415,8 +406,7 @@ public class AccessibilitySettings extends DashboardFragment implements
		}

		// Large pointer icon.
		mToggleLargePointerIconPreference =
		(SwitchPreference) findPreference(TOGGLE_LARGE_POINTER_ICON);
		mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON);

		mToggleDisableAnimationsPreference =
		(SwitchPreference) findPreference(TOGGLE_DISABLE_ANIMATIONS);
		@@ -699,10 +689,6 @@ public class AccessibilitySettings extends DashboardFragment implements
		mTogglePowerButtonEndsCallPreference.setChecked(powerButtonEndsCall);
		}

		// Large pointer icon.
		mToggleLargePointerIconPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
		Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0) != 0);

		// Master mono
		updateMasterMono();

src/com/android/settings/accessibility/LargePointerIconPreferenceController.java

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		* 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.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 AVAILABLE;
		}
		}

tests/robotests/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java

0 → 100644

+96 −0

Original line number	Diff line number	Diff line
		/*
		* 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 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.provider.Settings;

		import androidx.preference.SwitchPreference;

		import com.android.settings.core.BasePreferenceController;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;
		import org.robolectric.RuntimeEnvironment;

		@RunWith(RobolectricTestRunner.class)
		public class LargePointerIconPreferenceControllerTest {

		private static final int UNKNOWN = -1;

		private Context mContext;
		private SwitchPreference mPreference;
		private LargePointerIconPreferenceController mController;

		@Before
		public void setUp() {
		mContext = RuntimeEnvironment.application;
		mPreference = new SwitchPreference(mContext);
		mController = new LargePointerIconPreferenceController(mContext, "large_pointer");
		}

		@Test
		public void getAvailabilityStatus_shouldReturnAvailable() {
		assertThat(mController.getAvailabilityStatus()).isEqualTo(
		BasePreferenceController.AVAILABLE);
		}

		@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);
		}
		}