From 5a30a80824ab5425518d409fd2849661427c7b10 Mon Sep 17 00:00:00 2001 From: Taran Singh Date: Wed, 23 Feb 2022 21:30:20 +0000 Subject: [PATCH] Introduce developer option for Stylus handwriting Introduce a new developer option for Input Method: Stylus handwriting: when this setting is enabled, currently selected input method receives stylus events after focus on editor. Bug: 219777744 Test: atest StylusHandwritingPreferenceControllerTest Change-Id: Ia6335df60aae56973ed54bec1a243ea1de3aa6ad --- res/values/strings.xml | 8 ++ res/xml/development_settings.xml | 11 ++ .../DevelopmentSettingsDashboardFragment.java | 1 + ...StylusHandwritingPreferenceController.java | 69 +++++++++++ ...usHandwritingPreferenceControllerTest.java | 111 ++++++++++++++++++ 5 files changed, 200 insertions(+) create mode 100644 src/com/android/settings/development/StylusHandwritingPreferenceController.java create mode 100644 tests/robotests/src/com/android/settings/development/StylusHandwritingPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 9d868cbe4ea..ce1e638329f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -12277,6 +12277,14 @@ Track all GNSS constellations and frequencies with no duty cycling + + + Input Method + + Stylus handwriting + + When enabled, current Input method receives stylus MotionEvent if an Editor is focused. + Device theme diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index f29930c8bd4..c422df94af0 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -709,4 +709,15 @@ android:key="location_indicator_settings" settings:controller="com.android.settings.location.LocationIndicatorsPreferenceController"/> + + + + + diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 025c51f0327..434bcfd27ad 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -582,6 +582,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra bluetoothA2dpConfigStore, fragment)); controllers.add(new SharedDataPreferenceController(context)); controllers.add(new OverlaySettingsPreferenceController(context)); + controllers.add(new StylusHandwritingPreferenceController(context)); return controllers; } diff --git a/src/com/android/settings/development/StylusHandwritingPreferenceController.java b/src/com/android/settings/development/StylusHandwritingPreferenceController.java new file mode 100644 index 00000000000..69b5badc028 --- /dev/null +++ b/src/com/android/settings/development/StylusHandwritingPreferenceController.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2022 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.development; + +import android.content.Context; +import android.provider.Settings; + +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + +class StylusHandwritingPreferenceController extends DeveloperOptionsPreferenceController + implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { + + static final int SETTING_VALUE_ON = 1; + static final int SETTING_VALUE_OFF = 0; + + private static final String STYLUS_HANDWRITING_OPTIONS_KEY = "stylus_handwriting"; + + StylusHandwritingPreferenceController(Context context) { + super(context); + } + + @Override + public String getPreferenceKey() { + return STYLUS_HANDWRITING_OPTIONS_KEY; + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + final boolean isEnabled = (Boolean) newValue; + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, + isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); + + return true; + } + + @Override + public void updateState(Preference preference) { + final int enable = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, SETTING_VALUE_OFF); + ((SwitchPreference) mPreference).setChecked(enable != SETTING_VALUE_OFF); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + super.onDeveloperOptionsSwitchDisabled(); + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, SETTING_VALUE_OFF); + ((SwitchPreference) mPreference).setChecked(false); + } +} diff --git a/tests/robotests/src/com/android/settings/development/StylusHandwritingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StylusHandwritingPreferenceControllerTest.java new file mode 100644 index 00000000000..12b5fe9e0a8 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/StylusHandwritingPreferenceControllerTest.java @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2022 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.development; + +import static com.android.settings.development.StylusHandwritingPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.StylusHandwritingPreferenceController.SETTING_VALUE_ON; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.provider.Settings; + +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class StylusHandwritingPreferenceControllerTest { + + @Mock + private SwitchPreference mPreference; + @Mock + private PreferenceScreen mPreferenceScreen; + + private Context mContext; + private StylusHandwritingPreferenceController mController; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new StylusHandwritingPreferenceController(mContext); + when(mPreferenceScreen.findPreference(mController.getPreferenceKey())) + .thenReturn(mPreference); + mController.displayPreference(mPreferenceScreen); + } + + @Test + public void onPreferenceChange_settingEnabled_stylusHandwritingShouldBeOn() { + mController.onPreferenceChange(mPreference, true /* new value */); + + final int mode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, -1 /* default */); + + assertThat(mode).isEqualTo(SETTING_VALUE_ON); + } + + @Test + public void onPreferenceChange_settingEnabled_stylusHandwritingShouldBeOff() { + mController.onPreferenceChange(mPreference, false /* new value */); + + final int mode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, -1 /* default */); + + assertThat(mode).isEqualTo(SETTING_VALUE_OFF); + } + + @Test + public void updateState_settingDisabled_preferenceShouldNotBeChecked() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, SETTING_VALUE_OFF); + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void updateState_settingEnabled_preferenceShouldBeChecked() { + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, SETTING_VALUE_ON); + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { + mController.onDeveloperOptionsSwitchDisabled(); + + final int mode = Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.STYLUS_HANDWRITING_ENABLED, -1 /* default */); + + assertThat(mode).isEqualTo(SETTING_VALUE_OFF); + verify(mPreference).setChecked(false); + verify(mPreference).setEnabled(false); + } +}