Merge "Add accessibility display adjustments to Settings"
This commit is contained in:
committed by
Android (Google) Code Review
commit
394a517982
@@ -59,6 +59,7 @@ import android.view.Gravity;
|
||||
import android.view.HardwareRenderer;
|
||||
import android.view.IWindowManager;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
import android.webkit.WebViewFactory;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.Switch;
|
||||
@@ -114,6 +115,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
private static final String SHOW_TOUCHES_KEY = "show_touches";
|
||||
private static final String SHOW_SCREEN_UPDATES_KEY = "show_screen_updates";
|
||||
private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
|
||||
private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
|
||||
private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
|
||||
private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
|
||||
private static final String FORCE_MSAA_KEY = "force_msaa";
|
||||
@@ -195,6 +197,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
private ListPreference mAnimatorDurationScale;
|
||||
private ListPreference mOverlayDisplayDevices;
|
||||
private ListPreference mOpenGLTraces;
|
||||
private ListPreference mSimulateColorSpace;
|
||||
|
||||
private CheckBoxPreference mImmediatelyDestroyActivities;
|
||||
private ListPreference mAppProcessLimit;
|
||||
@@ -300,6 +303,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
|
||||
mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
|
||||
mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY);
|
||||
mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
|
||||
|
||||
mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference(
|
||||
IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
|
||||
@@ -513,6 +517,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
updateBugreportOptions();
|
||||
updateForceRtlOptions();
|
||||
updateWifiDisplayCertificationOptions();
|
||||
updateSimulateColorSpace();
|
||||
}
|
||||
|
||||
private void resetDangerousOptions() {
|
||||
@@ -949,6 +954,40 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
pokeSystemProperties();
|
||||
}
|
||||
|
||||
private void updateSimulateColorSpace() {
|
||||
final ContentResolver cr = getContentResolver();
|
||||
final boolean enabled = Settings.Secure.getInt(
|
||||
cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0) != 0;
|
||||
if (enabled) {
|
||||
final String mode = Integer.toString(Settings.Secure.getInt(
|
||||
cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER,
|
||||
AccessibilityManager.DALTONIZER_DISABLED));
|
||||
mSimulateColorSpace.setValue(mode);
|
||||
final int index = mSimulateColorSpace.findIndexOfValue(mode);
|
||||
if (index < 0) {
|
||||
// We're using a mode controlled by accessibility preferences.
|
||||
mSimulateColorSpace.setSummary(getString(R.string.daltonizer_type_overridden,
|
||||
getString(R.string.accessibility_display_daltonizer_preference_title)));
|
||||
} else {
|
||||
mSimulateColorSpace.setSummary("%s");
|
||||
}
|
||||
} else {
|
||||
mSimulateColorSpace.setValue(
|
||||
Integer.toString(AccessibilityManager.DALTONIZER_DISABLED));
|
||||
}
|
||||
}
|
||||
|
||||
private void writeSimulateColorSpace(Object value) {
|
||||
final ContentResolver cr = getContentResolver();
|
||||
final int newMode = Integer.parseInt(value.toString());
|
||||
if (newMode < 0) {
|
||||
Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0);
|
||||
} else {
|
||||
Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 1);
|
||||
Settings.Secure.putInt(cr, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, newMode);
|
||||
}
|
||||
}
|
||||
|
||||
private void updateForceRtlOptions() {
|
||||
updateCheckBox(mForceRtlLayout, Settings.Global.getInt(getActivity().getContentResolver(),
|
||||
Settings.Global.DEVELOPMENT_FORCE_RTL, 0) != 0);
|
||||
@@ -1350,6 +1389,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
|
||||
} else if (preference == mAppProcessLimit) {
|
||||
writeAppProcessLimitOptions(newValue);
|
||||
return true;
|
||||
} else if (preference == mSimulateColorSpace) {
|
||||
writeSimulateColorSpace(newValue);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@@ -332,6 +332,9 @@ public class Settings extends PreferenceActivity
|
||||
DeviceAdminSettings.class.getName(),
|
||||
AccessibilitySettings.class.getName(),
|
||||
ToggleCaptioningPreferenceFragment.class.getName(),
|
||||
com.android.settings.accessibility.ToggleInversionPreferenceFragment.class.getName(),
|
||||
com.android.settings.accessibility.ToggleContrastPreferenceFragment.class.getName(),
|
||||
com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.class.getName(),
|
||||
TextToSpeechSettings.class.getName(),
|
||||
Memory.class.getName(),
|
||||
DevelopmentSettings.class.getName(),
|
||||
@@ -1077,6 +1080,9 @@ public class Settings extends PreferenceActivity
|
||||
public static class DevelopmentSettingsActivity extends Settings { /* empty */ }
|
||||
public static class AccessibilitySettingsActivity extends Settings { /* empty */ }
|
||||
public static class CaptioningSettingsActivity extends Settings { /* empty */ }
|
||||
public static class AccessibilityInversionSettingsActivity extends Settings { /* empty */ }
|
||||
public static class AccessibilityContrastSettingsActivity extends Settings { /* empty */ }
|
||||
public static class AccessibilityDaltonizerSettingsActivity extends Settings { /* empty */ }
|
||||
public static class SecuritySettingsActivity extends Settings { /* empty */ }
|
||||
public static class LocationSettingsActivity extends Settings { /* empty */ }
|
||||
public static class PrivacySettingsActivity extends Settings { /* empty */ }
|
||||
|
@@ -103,6 +103,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
"captioning_preference_screen";
|
||||
private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
|
||||
"screen_magnification_preference_screen";
|
||||
private static final String DISPLAY_CONTRAST_PREFERENCE_SCREEN =
|
||||
"contrast_preference_screen";
|
||||
private static final String DISPLAY_INVERSION_PREFERENCE_SCREEN =
|
||||
"inversion_preference_screen";
|
||||
private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
|
||||
"daltonizer_preference_screen";
|
||||
|
||||
// Extras passed to sub-fragments.
|
||||
static final String EXTRA_PREFERENCE_KEY = "preference_key";
|
||||
@@ -198,6 +204,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
private PreferenceScreen mCaptioningPreferenceScreen;
|
||||
private PreferenceScreen mDisplayMagnificationPreferenceScreen;
|
||||
private PreferenceScreen mGlobalGesturePreferenceScreen;
|
||||
private PreferenceScreen mDisplayInversionPreferenceScreen;
|
||||
private PreferenceScreen mDisplayContrastPreferenceScreen;
|
||||
private PreferenceScreen mDisplayDaltonizerPreferenceScreen;
|
||||
|
||||
private int mLongPressTimeoutDefault;
|
||||
|
||||
@@ -375,6 +384,14 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
mDisplayMagnificationPreferenceScreen = (PreferenceScreen) findPreference(
|
||||
DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
|
||||
|
||||
// Display color adjustments.
|
||||
mDisplayContrastPreferenceScreen = (PreferenceScreen) findPreference(
|
||||
DISPLAY_CONTRAST_PREFERENCE_SCREEN);
|
||||
mDisplayInversionPreferenceScreen = (PreferenceScreen) findPreference(
|
||||
DISPLAY_INVERSION_PREFERENCE_SCREEN);
|
||||
mDisplayDaltonizerPreferenceScreen = (PreferenceScreen) findPreference(
|
||||
DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
|
||||
|
||||
// Global gesture.
|
||||
mGlobalGesturePreferenceScreen =
|
||||
(PreferenceScreen) findPreference(ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN);
|
||||
@@ -518,25 +535,16 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
mSelectLongPressTimeoutPreference.setValue(value);
|
||||
mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
|
||||
|
||||
// Captioning.
|
||||
final boolean captioningEnabled = Settings.Secure.getInt(getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, 0) == 1;
|
||||
if (captioningEnabled) {
|
||||
mCaptioningPreferenceScreen.setSummary(R.string.accessibility_feature_state_on);
|
||||
} else {
|
||||
mCaptioningPreferenceScreen.setSummary(R.string.accessibility_feature_state_off);
|
||||
}
|
||||
|
||||
// Screen magnification.
|
||||
final boolean magnificationEnabled = Settings.Secure.getInt(getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
|
||||
if (magnificationEnabled) {
|
||||
mDisplayMagnificationPreferenceScreen.setSummary(
|
||||
R.string.accessibility_feature_state_on);
|
||||
} else {
|
||||
mDisplayMagnificationPreferenceScreen.setSummary(
|
||||
R.string.accessibility_feature_state_off);
|
||||
}
|
||||
updateFeatureSummary(Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED,
|
||||
mCaptioningPreferenceScreen);
|
||||
updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED,
|
||||
mDisplayMagnificationPreferenceScreen);
|
||||
updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED,
|
||||
mDisplayInversionPreferenceScreen);
|
||||
updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_CONTRAST_ENABLED,
|
||||
mDisplayContrastPreferenceScreen);
|
||||
updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
|
||||
mDisplayDaltonizerPreferenceScreen);
|
||||
|
||||
// Global gesture
|
||||
final boolean globalGestureEnabled = Settings.Global.getInt(getContentResolver(),
|
||||
@@ -550,6 +558,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
}
|
||||
}
|
||||
|
||||
private void updateFeatureSummary(String prefKey, Preference pref) {
|
||||
final boolean enabled = Settings.Secure.getInt(getContentResolver(), prefKey, 0) == 1;
|
||||
pref.setSummary(enabled ? R.string.accessibility_feature_state_on
|
||||
: R.string.accessibility_feature_state_off);
|
||||
}
|
||||
|
||||
private void updateLockScreenRotationCheckbox() {
|
||||
Context context = getActivity();
|
||||
if (context != null) {
|
||||
|
@@ -0,0 +1,121 @@
|
||||
/*
|
||||
* Copyright (C) 2013 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.accessibility;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.preference.CheckBoxPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceScreen;
|
||||
import android.preference.SeekBarPreference;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.CompoundButton.OnCheckedChangeListener;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
|
||||
|
||||
public class ToggleContrastPreferenceFragment extends ToggleFeaturePreferenceFragment
|
||||
implements Preference.OnPreferenceChangeListener {
|
||||
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_CONTRAST_ENABLED;
|
||||
private static final String QUICK_SETTING_ENABLED =
|
||||
Settings.Secure.ACCESSIBILITY_DISPLAY_CONTRAST_QUICK_SETTING_ENABLED;
|
||||
|
||||
private CheckBoxPreference mEnableQuickSetting;
|
||||
private SeekBarPreference mBrightness;
|
||||
private SeekBarPreference mContrast;
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
addPreferencesFromResource(R.xml.accessibility_contrast_settings);
|
||||
|
||||
mEnableQuickSetting = (CheckBoxPreference) findPreference("enable_quick_setting");
|
||||
mBrightness = (SeekBarPreference) findPreference("brightness");
|
||||
mBrightness.setMax(1000);
|
||||
mContrast = (SeekBarPreference) findPreference("contrast");
|
||||
mContrast.setMax(1000);
|
||||
|
||||
initPreferences();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
|
||||
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 1 : 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
if (preference == mEnableQuickSetting) {
|
||||
Settings.Secure.putInt(
|
||||
getContentResolver(), QUICK_SETTING_ENABLED, ((Boolean) newValue) ? 1 : 0);
|
||||
} else if (preference == mBrightness) {
|
||||
final int progress = (Integer) newValue;
|
||||
final float value = progress / 1000f - 0.5f;
|
||||
Settings.Secure.putFloat(
|
||||
getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_BRIGHTNESS, value);
|
||||
} else if (preference == mContrast) {
|
||||
final int progress = (Integer) newValue;
|
||||
final float value = progress / 1000f * 10f + 1f;
|
||||
Settings.Secure.putFloat(
|
||||
getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_CONTRAST, value);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
setTitle(getString(R.string.accessibility_display_contrast_preference_title));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onInstallActionBarToggleSwitch() {
|
||||
super.onInstallActionBarToggleSwitch();
|
||||
|
||||
mToggleSwitch.setCheckedInternal(
|
||||
Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
|
||||
mToggleSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton button, boolean checked) {
|
||||
onPreferenceToggled(mPreferenceKey, checked);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void initPreferences() {
|
||||
mEnableQuickSetting.setChecked(
|
||||
Settings.Secure.getInt(getContentResolver(), QUICK_SETTING_ENABLED, 0) == 1);
|
||||
mEnableQuickSetting.setOnPreferenceChangeListener(this);
|
||||
|
||||
final float brightness = Settings.Secure.getFloat(
|
||||
getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_BRIGHTNESS, 0);
|
||||
final float contrast = Settings.Secure.getFloat(
|
||||
getContentResolver(), Settings.Secure.ACCESSIBILITY_DISPLAY_CONTRAST, 2);
|
||||
|
||||
// Available brightness range is -0.5 to 0.5.
|
||||
mBrightness.setProgress((int) (1000 * (brightness + 0.5f)));
|
||||
mBrightness.setOnPreferenceChangeListener(this);
|
||||
|
||||
// Available contrast range is 1 to 10.
|
||||
mContrast.setProgress((int) (1000 * (contrast - 1f) / 10f));
|
||||
mContrast.setOnPreferenceChangeListener(this);
|
||||
}
|
||||
}
|
@@ -0,0 +1,114 @@
|
||||
/*
|
||||
* Copyright (C) 2013 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.accessibility;
|
||||
|
||||
import android.accessibilityservice.AccessibilityService;
|
||||
import android.os.Bundle;
|
||||
import android.preference.CheckBoxPreference;
|
||||
import android.preference.ListPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.preference.PreferenceScreen;
|
||||
import android.preference.SeekBarPreference;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.CompoundButton.OnCheckedChangeListener;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
|
||||
|
||||
public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
|
||||
implements Preference.OnPreferenceChangeListener {
|
||||
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 QUICK_SETTING_ENABLED =
|
||||
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_QUICK_SETTING_ENABLED;
|
||||
private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
|
||||
|
||||
private CheckBoxPreference mEnableQuickSetting;
|
||||
private ListPreference mType;
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
addPreferencesFromResource(R.xml.accessibility_daltonizer_settings);
|
||||
|
||||
mEnableQuickSetting = (CheckBoxPreference) findPreference("enable_quick_setting");
|
||||
mType = (ListPreference) findPreference("type");
|
||||
|
||||
initPreferences();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
|
||||
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 1 : 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
if (preference == mEnableQuickSetting) {
|
||||
Settings.Secure.putInt(
|
||||
getContentResolver(), QUICK_SETTING_ENABLED, ((Boolean) newValue) ? 1 : 0);
|
||||
} else if (preference == mType) {
|
||||
Settings.Secure.putInt(getContentResolver(), TYPE, Integer.parseInt((String) newValue));
|
||||
preference.setSummary("%s");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
setTitle(getString(R.string.accessibility_display_daltonizer_preference_title));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onInstallActionBarToggleSwitch() {
|
||||
super.onInstallActionBarToggleSwitch();
|
||||
|
||||
mToggleSwitch.setCheckedInternal(
|
||||
Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
|
||||
mToggleSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton button, boolean checked) {
|
||||
onPreferenceToggled(mPreferenceKey, checked);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void initPreferences() {
|
||||
mEnableQuickSetting.setChecked(
|
||||
Settings.Secure.getInt(getContentResolver(), QUICK_SETTING_ENABLED, 0) == 1);
|
||||
mEnableQuickSetting.setOnPreferenceChangeListener(this);
|
||||
|
||||
final String value = Integer.toString(
|
||||
Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE));
|
||||
mType.setValue(value);
|
||||
mType.setOnPreferenceChangeListener(this);
|
||||
final int index = mType.findIndexOfValue(value);
|
||||
if (index < 0) {
|
||||
// We're using a mode controlled by developer preferences.
|
||||
mType.setSummary(getString(R.string.daltonizer_type_overridden,
|
||||
getString(R.string.simulate_color_space)));
|
||||
}
|
||||
}
|
||||
}
|
@@ -92,9 +92,6 @@ public abstract class ToggleFeaturePreferenceFragment
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
onInstallActionBarToggleSwitch();
|
||||
onProcessArguments(getArguments());
|
||||
// Set a transparent drawable to prevent use of the default one.
|
||||
getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
|
||||
getListView().setDivider(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -135,21 +132,45 @@ public abstract class ToggleFeaturePreferenceFragment
|
||||
return toggleSwitch;
|
||||
}
|
||||
|
||||
protected void onProcessArguments(Bundle arguments) {
|
||||
// Key.
|
||||
mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);
|
||||
// Enabled.
|
||||
final boolean enabled = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);
|
||||
mToggleSwitch.setCheckedInternal(enabled);
|
||||
// Title.
|
||||
PreferenceActivity activity = (PreferenceActivity) getActivity();
|
||||
public void setTitle(String title) {
|
||||
final PreferenceActivity activity = (PreferenceActivity) getActivity();
|
||||
if (!activity.onIsMultiPane() || activity.onIsHidingHeaders()) {
|
||||
mOldActivityTitle = getActivity().getTitle();
|
||||
String title = arguments.getString(AccessibilitySettings.EXTRA_TITLE);
|
||||
getActivity().getActionBar().setTitle(title);
|
||||
}
|
||||
}
|
||||
|
||||
protected void onProcessArguments(Bundle arguments) {
|
||||
if (arguments == null) {
|
||||
getPreferenceScreen().removePreference(mSummaryPreference);
|
||||
return;
|
||||
}
|
||||
|
||||
// Key.
|
||||
mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);
|
||||
|
||||
// Enabled.
|
||||
if (arguments.containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
|
||||
final boolean enabled = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);
|
||||
mToggleSwitch.setCheckedInternal(enabled);
|
||||
}
|
||||
|
||||
// Title.
|
||||
if (arguments.containsKey(AccessibilitySettings.EXTRA_TITLE)) {
|
||||
setTitle(arguments.getString(AccessibilitySettings.EXTRA_TITLE));
|
||||
}
|
||||
|
||||
// Summary.
|
||||
CharSequence summary = arguments.getCharSequence(AccessibilitySettings.EXTRA_SUMMARY);
|
||||
mSummaryPreference.setSummary(summary);
|
||||
if (arguments.containsKey(AccessibilitySettings.EXTRA_SUMMARY)) {
|
||||
final CharSequence summary = arguments.getCharSequence(
|
||||
AccessibilitySettings.EXTRA_SUMMARY);
|
||||
mSummaryPreference.setSummary(summary);
|
||||
|
||||
// Set a transparent drawable to prevent use of the default one.
|
||||
getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
|
||||
getListView().setDivider(null);
|
||||
} else {
|
||||
getPreferenceScreen().removePreference(mSummaryPreference);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,105 @@
|
||||
/*
|
||||
* Copyright (C) 2013 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.accessibility;
|
||||
|
||||
import android.accessibilityservice.AccessibilityService;
|
||||
import android.os.Bundle;
|
||||
import android.preference.CheckBoxPreference;
|
||||
import android.preference.ListPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceScreen;
|
||||
import android.preference.SeekBarPreference;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
import android.widget.CompoundButton;
|
||||
import android.widget.CompoundButton.OnCheckedChangeListener;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.accessibility.ToggleSwitch.OnBeforeCheckedChangeListener;
|
||||
|
||||
public class ToggleInversionPreferenceFragment extends ToggleFeaturePreferenceFragment
|
||||
implements Preference.OnPreferenceChangeListener {
|
||||
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
|
||||
private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION;
|
||||
private static final String QUICK_SETTING_ENABLED =
|
||||
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_QUICK_SETTING_ENABLED;
|
||||
private static final int DEFAULT_TYPE = AccessibilityManager.INVERSION_STANDARD;
|
||||
|
||||
private CheckBoxPreference mEnableQuickSetting;
|
||||
private ListPreference mType;
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
addPreferencesFromResource(R.xml.accessibility_inversion_settings);
|
||||
|
||||
mEnableQuickSetting = (CheckBoxPreference) findPreference("enable_quick_setting");
|
||||
mType = (ListPreference) findPreference("type");
|
||||
|
||||
initPreferences();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
|
||||
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 1 : 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||
if (preference == mEnableQuickSetting) {
|
||||
Settings.Secure.putInt(
|
||||
getContentResolver(), QUICK_SETTING_ENABLED, ((Boolean) newValue) ? 1 : 0);
|
||||
} else if (preference == mType) {
|
||||
Settings.Secure.putInt(getContentResolver(), TYPE, Integer.parseInt((String) newValue));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
||||
setTitle(getString(R.string.accessibility_display_inversion_preference_title));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onInstallActionBarToggleSwitch() {
|
||||
super.onInstallActionBarToggleSwitch();
|
||||
|
||||
mToggleSwitch.setCheckedInternal(
|
||||
Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
|
||||
mToggleSwitch.setOnCheckedChangeListener(new OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton button, boolean checked) {
|
||||
onPreferenceToggled(mPreferenceKey, checked);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void initPreferences() {
|
||||
mEnableQuickSetting.setChecked(
|
||||
Settings.Secure.getInt(getContentResolver(), QUICK_SETTING_ENABLED, 0) == 1);
|
||||
mEnableQuickSetting.setOnPreferenceChangeListener(this);
|
||||
|
||||
mType.setValue(
|
||||
Integer.toString(Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE)));
|
||||
mType.setOnPreferenceChangeListener(this);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user