diff --git a/res/layout/preference_button.xml b/res/layout/preference_button.xml new file mode 100644 index 00000000000..35e425587e8 --- /dev/null +++ b/res/layout/preference_button.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 539dc058eba..13cecb20b80 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -264,4 +264,8 @@ 240dp + + + 24dp + 18dp diff --git a/res/values/strings.xml b/res/values/strings.xml index 9ab180d90db..f0bea19f05c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3623,6 +3623,8 @@ Accessibility Accessibility settings + + Guide me Services @@ -3634,7 +3636,7 @@ Magnification gestures - When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n\n\nYou can also temporarily magnify what\u2019s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar. + Zoom in and out by triple-tapping the screen with one finger.\n\nWhile zoomed in, you can:\n\n\nTriple-tap for magnification works everywhere except the keyboard and navigation bar. Accessibility shortcut diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml index 791f1b83558..591bdad5985 100644 --- a/res/xml/accessibility_settings.xml +++ b/res/xml/accessibility_settings.xml @@ -16,7 +16,13 @@ + android:title="@string/accessibility_settings" + android:persistent="true"> + + + + + + + + + + + + + + + + + diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index 672582d592a..fdf01e9c7bd 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -554,6 +554,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements } mToggleLargeTextPreference.setChecked(mCurConfig.fontScale == LARGE_FONT_SCALE); + // Text contrast. mToggleHighTextContrastPreference.setChecked( Settings.Secure.getInt(getContentResolver(), Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, 0) == 1); diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java new file mode 100644 index 00000000000..26af58bb337 --- /dev/null +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2015 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.provider.Settings; +import android.support.v7.preference.Preference; +import com.android.internal.logging.MetricsLogger; +import com.android.settings.DialogCreatable; +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + +/** + * Activity with the accessibility settings specific to Setup Wizard. + */ +public class AccessibilitySettingsForSetupWizard extends SettingsPreferenceFragment + implements DialogCreatable, Preference.OnPreferenceChangeListener { + + // Preferences + private static final String DISPLAY_MAGNIFICATION_PREFERENCE = + "screen_magnification_preference"; + private static final String DISPLAY_DALTONIZER_PREFERENCE = "daltonizer_preference"; + private static final String TALKBACK_PREFERENCE = "talkback_preference"; + + private static final String TALKBACK_NAME = "Talkback"; + + // Preference controls. + private Preference mDisplayMagnificationPreference; + private Preference mDisplayDaltonizerPreference; + private Preference mTalkbackPreference; + + @Override + protected int getMetricsCategory() { + return MetricsLogger.ACCESSIBILITY; + } + + @Override + protected int getHelpResource() { + return R.string.help_uri_accessibility; + } + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + addPreferencesFromResource(R.xml.accessibility_settings_for_setup_wizard); + + mDisplayMagnificationPreference = findPreference(DISPLAY_MAGNIFICATION_PREFERENCE); + mDisplayDaltonizerPreference = findPreference(DISPLAY_DALTONIZER_PREFERENCE); + + mTalkbackPreference = findPreference(TALKBACK_PREFERENCE); + mTalkbackPreference.setTitle(TALKBACK_NAME); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + setHasOptionsMenu(false); + } + + @Override + public void onResume() { + super.onResume(); + updatePreferences(); + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + return false; + } + + @Override + public boolean onPreferenceTreeClick(Preference preference) { + if (mDisplayMagnificationPreference == preference) { + Bundle extras = mDisplayMagnificationPreference.getExtras(); + extras.putString(AccessibilitySettings.EXTRA_TITLE, + getString(R.string.accessibility_screen_magnification_title)); + extras.putCharSequence(AccessibilitySettings.EXTRA_SUMMARY, + getActivity().getResources().getText( + R.string.accessibility_screen_magnification_summary)); + extras.putBoolean(AccessibilitySettings.EXTRA_CHECKED, + Settings.Secure.getInt(getContentResolver(), + Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1); + } + + return super.onPreferenceTreeClick(preference); + } + + private void updatePreferences() { + updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, + mDisplayMagnificationPreference); + updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, + mDisplayDaltonizerPreference); + } + + 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); + } +}