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

Remove obsolete development setting

Browse Source 
Remove the "Force GPU Rendering" option. Nobody is testing
their pre-honeycomb apps anymore, so this setting has outlived
its usefulness.

Test: builds
Change-Id: I8780db1de4e178b4c99936b274576d743e7f6438
This commit is contained in:
John Reck
2018-03-02 15:50:37 -08:00
parent 22a39c2b93
commit fcaf80e8c5
4 changed files with 0 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_settings.xml
View File

@@ -395,11 +395,6 @@
android:title="@string/debug_hw_drawing_category"
android:order="700">
<SwitchPreference
android:key="force_hw_ui"
android:title="@string/force_hw_ui"
android:summary="@string/force_hw_ui_summary" />
<SwitchPreference
android:key="show_hw_screen_updates"
android:title="@string/show_hw_screen_updates"

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

@@ -428,7 +428,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new TransitionAnimationScalePreferenceController(context));
controllers.add(new AnimatorDurationScalePreferenceController(context));
controllers.add(new SecondaryDisplayPreferenceController(context));
controllers.add(new ForceGpuRenderingPreferenceController(context));
controllers.add(new GpuViewUpdatesPreferenceController(context));
controllers.add(new HardwareLayersUpdatesPreferenceController(context));
controllers.add(new DebugGpuOverdrawPreferenceController(context));

68
src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
View File

@@ -1,68 +0,0 @@
/*
* 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.os.SystemProperties;
import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
public class ForceGpuRenderingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
@VisibleForTesting
static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
public ForceGpuRenderingPreferenceController(Context context) {
super(context);
}
@Override
public String getPreferenceKey() {
return FORCE_HARDWARE_UI_KEY;
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
SystemProperties.set(HARDWARE_UI_PROPERTY,
isEnabled ? Boolean.toString(true) : Boolean.toString(false));
SystemPropPoker.getInstance().poke();
return true;
}
@Override
public void updateState(Preference preference) {
final boolean isEnabled = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
false /* default */);
((SwitchPreference) mPreference).setChecked(isEnabled);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
((SwitchPreference) mPreference).setChecked(false);
}
}

103
tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
View File

@@ -1,103 +0,0 @@
/*
* 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.android.settings.development.ForceGpuRenderingPreferenceController.HARDWARE_UI_PROPERTY;
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.os.SystemProperties;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
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;
@RunWith(SettingsRobolectricTestRunner.class)
public class ForceGpuRenderingPreferenceControllerTest {
@Mock
private SwitchPreference mPreference;
@Mock
private PreferenceScreen mPreferenceScreen;
private Context mContext;
private ForceGpuRenderingPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mController = new ForceGpuRenderingPreferenceController(mContext);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@Test
public void onPreferenceChanged_settingEnabled_turnOnForceGpuRendering() {
mController.onPreferenceChange(mPreference, true /* new value */);
final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
assertThat(mode).isTrue();
}
@Test
public void onPreferenceChanged_settingDisabled_turnOffForceGpuRendering() {
mController.onPreferenceChange(mPreference, false /* new value */);
final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
}
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
assertThat(mode).isFalse();
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
}
}