PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce PointerLocationPreferenceController

Browse Source 
- Create new PointerLocationPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ia2d190ec39d35e10d7ae6663584b993d16958d5e
This commit is contained in:
jeffreyhuang
2017-09-27 13:59:46 -07:00
parent 3e6488448c
commit 5acf47e402
3 changed files with 219 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -223,7 +223,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
// bluetooth audio channel mode
// bluetooth audio ldac codec: playback quality
controllers.add(new ShowTapsPreferenceController(context));
// pointer location
controllers.add(new PointerLocationPreferenceController(context));
// show surface updates
// show layout bounds
// force rtl layout direction

86
src/com/android/settings/development/PointerLocationPreferenceController.java Normal file
View File

@@ -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 PointerLocationPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener {
private static final String POINTER_LOCATION_KEY = "pointer_location";
@VisibleForTesting
static final int SETTING_VALUE_ON = 1;
@VisibleForTesting
static final int SETTING_VALUE_OFF = 0;
private SwitchPreference mPreference;
public PointerLocationPreferenceController(Context context) {
super(context);
}
@Override
public boolean isAvailable() {
return true;
}
@Override
public String getPreferenceKey() {
return POINTER_LOCATION_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.POINTER_LOCATION, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
return true;
}
@Override
public void updateState(Preference preference) {
final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.POINTER_LOCATION, SETTING_VALUE_OFF);
mPreference.setChecked(pointerLocationMode != SETTING_VALUE_OFF);
}
@Override
protected void onDeveloperOptionsSwitchEnabled() {
mPreference.setEnabled(true);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
Settings.System.putInt(mContext.getContentResolver(), Settings.System.POINTER_LOCATION,
SETTING_VALUE_OFF);
mPreference.setChecked(false);
mPreference.setEnabled(false);
}
}

132
tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,132 @@
/*
* 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 PointerLocationPreferenceControllerTest {
@Mock
private PreferenceScreen mScreen;
@Mock
private SwitchPreference mPreference;
private Context mContext;
private PointerLocationPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new PointerLocationPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
mController.displayPreference(mScreen);
}
@After
public void tearDown() {
SettingsShadowSystemProperties.clear();
}
@Test
public void updateState_pointerLocationEnabled_shouldCheckedPreference() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.POINTER_LOCATION,
PointerLocationPreferenceController.SETTING_VALUE_ON);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
}
@Test
public void updateState_pointerLocationDisabled_shouldUncheckedPreference() {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.POINTER_LOCATION,
PointerLocationPreferenceController.SETTING_VALUE_OFF);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void onPreferenceChange_preferenceChecked_shouldEnablePointerLocation() {
mController.onPreferenceChange(mPreference, true /* new value */);
final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.POINTER_LOCATION, -1 /* default */);
assertThat(pointerLocationMode).isEqualTo(
PointerLocationPreferenceController.SETTING_VALUE_ON);
}
@Test
public void onPreferenceChange__preferenceUnchecked_shouldDisablePointerLocation() {
mController.onPreferenceChange(mPreference, false /* new value */);
final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.POINTER_LOCATION, -1 /* default */);
assertThat(pointerLocationMode).isEqualTo(
PointerLocationPreferenceController.SETTING_VALUE_OFF);
}
@Test
public void onDeveloperOptionsSwitchEnabled_preferenceShouldBeEnabled() {
mController.onDeveloperOptionsSwitchEnabled();
verify(mPreference).setEnabled(true);
}
@Test
public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeEnabled() {
mController.onDeveloperOptionsSwitchDisabled();
final int pointerLocationMode = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.POINTER_LOCATION, -1 /* default */);
assertThat(pointerLocationMode).isEqualTo(
PointerLocationPreferenceController.SETTING_VALUE_OFF);
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
}
}