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

Settings: Remove quick settings options for daltonizer.

Browse Source 
Bug:15424806
Change-Id: I91a9cd974d9e370f899e7573d00f6d27fe2e5538
This commit is contained in:
John Spurlock
2014-06-04 11:12:30 -04:00
parent 5b210dd572
commit fe002e21a8
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/accessibility_daltonizer_settings.xml
View File

@@ -17,11 +17,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/accessibility_display_daltonizer_preference_title" > android:title="@string/accessibility_display_daltonizer_preference_title" >
<CheckBoxPreference
android:key="enable_quick_setting"
android:persistent="false"
android:title="@string/enable_quick_setting" />
<ListPreference <ListPreference
android:entries="@array/daltonizer_type_entries" android:entries="@array/daltonizer_type_entries"
android:entryValues="@array/daltonizer_type_values" android:entryValues="@array/daltonizer_type_values"

14
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.accessibility; package com.android.settings.accessibility;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.provider.Settings; import android.provider.Settings;
@@ -32,11 +31,8 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener { implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED; private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER; private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
private static final String QUICK_SETTING_ENABLED =
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_QUICK_SETTING_ENABLED;
private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY; private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
private CheckBoxPreference mEnableQuickSetting;
private ListPreference mType; private ListPreference mType;
@Override @Override
@@ -45,7 +41,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
addPreferencesFromResource(R.xml.accessibility_daltonizer_settings); addPreferencesFromResource(R.xml.accessibility_daltonizer_settings);
mEnableQuickSetting = (CheckBoxPreference) findPreference("enable_quick_setting");
mType = (ListPreference) findPreference("type"); mType = (ListPreference) findPreference("type");
initPreferences(); initPreferences();
@@ -58,10 +53,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mEnableQuickSetting) { if (preference == mType) {
Settings.Secure.putInt(
getContentResolver(), QUICK_SETTING_ENABLED, ((Boolean) newValue) ? 1 : 0);
} else if (preference == mType) {
Settings.Secure.putInt(getContentResolver(), TYPE, Integer.parseInt((String) newValue)); Settings.Secure.putInt(getContentResolver(), TYPE, Integer.parseInt((String) newValue));
preference.setSummary("%s"); preference.setSummary("%s");
} }
@@ -92,10 +84,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
} }
private void initPreferences() { private void initPreferences() {
mEnableQuickSetting.setChecked(
Settings.Secure.getInt(getContentResolver(), QUICK_SETTING_ENABLED, 0) == 1);
mEnableQuickSetting.setOnPreferenceChangeListener(this);
final String value = Integer.toString( final String value = Integer.toString(
Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE)); Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE));
mType.setValue(value); mType.setValue(value);