Merge "Fix default for a11y shortcut setting" into oc-dev am: 5ef1135b9f

am: bffd5636ff

Change-Id: I37e5b5651d3f1930791acf013bce10f9e5cb50ce
This commit is contained in:
Phil Weaver
2017-04-20 18:53:23 +00:00
committed by android-build-merger

View File

@@ -95,7 +95,7 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer
CharSequence serviceName = getServiceName(getContext());
mServicePreference.setSummary(serviceName);
mOnLockScreenSwitchPreference.setChecked(Settings.Secure.getInt(
cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, 1) == 1);
cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, 0) == 1);
if (TextUtils.equals(serviceName, getString(R.string.accessibility_no_service_selected))) {
// If there's no service configured, enabling the shortcut will have no effect
// It should already be disabled, but force the switch to off just in case