diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 8cee7a36e4d..51fb436549a 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -222,7 +222,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra // bluetooth audio bits per sample // bluetooth audio channel mode // bluetooth audio ldac codec: playback quality - // show taps + controllers.add(new ShowTapsPreferenceController(context)); // pointer location // show surface updates // show layout bounds diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java new file mode 100644 index 00000000000..ccfcbfa7919 --- /dev/null +++ b/src/com/android/settings/development/ShowTapsPreferenceController.java @@ -0,0 +1,86 @@ +/* + * 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.settings.development; + +import android.content.Context; +import android.provider.Settings; +import android.support.annotation.VisibleForTesting; +import android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceController implements + Preference.OnPreferenceChangeListener { + + private static final String SHOW_TOUCHES_KEY = "show_touches"; + + @VisibleForTesting + static final int SETTING_VALUE_ON = 1; + @VisibleForTesting + static final int SETTING_VALUE_OFF = 0; + + private SwitchPreference mPreference; + + public ShowTapsPreferenceController(Context context) { + super(context); + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return SHOW_TOUCHES_KEY; + } + + @Override + public void displayPreference(PreferenceScreen screen) { + super.displayPreference(screen); + + mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey()); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + final boolean isEnabled = (Boolean) newValue; + Settings.System.putInt(mContext.getContentResolver(), + Settings.System.SHOW_TOUCHES, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); + return true; + } + + @Override + public void updateState(Preference preference) { + int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), + Settings.System.SHOW_TOUCHES, SETTING_VALUE_OFF); + mPreference.setChecked(showTapsMode != SETTING_VALUE_OFF); + } + + @Override + protected void onDeveloperOptionsSwitchEnabled() { + mPreference.setEnabled(true); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + Settings.System.putInt(mContext.getContentResolver(), Settings.System.SHOW_TOUCHES, + SETTING_VALUE_OFF); + mPreference.setChecked(false); + mPreference.setEnabled(false); + } +} diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java new file mode 100644 index 00000000000..b2731ea5bf9 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -0,0 +1,127 @@ +/* + * 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.settings.development; + +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 android.support.v14.preference.SwitchPreference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.TestConfig; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.SettingsShadowSystemProperties; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class ShowTapsPreferenceControllerTest { + + @Mock + private PreferenceScreen mScreen; + @Mock + private SwitchPreference mPreference; + + private Context mContext; + + private ShowTapsPreferenceController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; + mController = new ShowTapsPreferenceController(mContext); + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + mController.displayPreference(mScreen); + } + + @After + public void tearDown() { + SettingsShadowSystemProperties.clear(); + } + + @Test + public void updateState_showTapsEnabled_shouldCheckedPreference() { + Settings.System.putInt(mContext.getContentResolver(), + Settings.System.SHOW_TOUCHES, ShowTapsPreferenceController.SETTING_VALUE_ON); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_showTapsDisabled_shouldUncheckedPreference() { + Settings.System.putInt(mContext.getContentResolver(), + Settings.System.SHOW_TOUCHES, ShowTapsPreferenceController.SETTING_VALUE_OFF); + + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onPreferenceChange_preferenceChecked_shouldEnableShowTaps() { + mController.onPreferenceChange(mPreference, true /* new value */); + + int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), + Settings.System.SHOW_TOUCHES, -1 /* default */); + + assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_ON); + } + + @Test + public void onPreferenceChange__preferenceUnchecked_shouldDisableCameraLaserSensor() { + mController.onPreferenceChange(mPreference, false /* new value */); + + int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), + Settings.System.SHOW_TOUCHES, -1 /* default */); + + assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF); + } + + @Test + public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() { + mController.onDeveloperOptionsSwitchEnabled(); + + verify(mPreference).setEnabled(true); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() { + mController.onDeveloperOptionsSwitchDisabled(); + + int showTapsMode = Settings.System.getInt(mContext.getContentResolver(), + Settings.System.SHOW_TOUCHES, -1 /* default */); + + assertThat(showTapsMode).isEqualTo(ShowTapsPreferenceController.SETTING_VALUE_OFF); + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } +}