Merge "Separate daltonizer preference controller form accessibility" (08e3b42a) · Commits · e / os / android_packages_apps_Settings

res/xml/accessibility_settings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -173,11 +173,11 @@
		settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
		android:key="daltonizer_preference"
		android:title="@string/accessibility_display_daltonizer_preference_title"
		android:icon="@drawable/ic_daltonizer"
		settings:searchable="false"/>
		android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
		settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>

		<SwitchPreference
		android:key="toggle_inversion_preference"

+0 −9

Original line number	Diff line number	Diff line
		@@ -607,18 +607,9 @@ public class AccessibilitySettings extends DashboardFragment implements

		mLiveCaptionPreferenceController.updateState(mLiveCaptionPreference);

		updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,
		mDisplayDaltonizerPreferenceScreen);

		updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
		}

		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 updateAccessibilityShortcut(Preference preference) {
		if (AccessibilityManager.getInstance(getActivity())
		.getInstalledAccessibilityServiceList().isEmpty()) {

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.content.Context;
		import android.provider.Settings;

		import com.android.settings.R;

		public class AccessibilityUtil {
		/**
		* Return On/Off string according to the setting which specifies the integer value 1 or 0. This
		* setting is defined in the secure system settings {@link android.provider.Settings.Secure}.
		*/
		static CharSequence getSummary(Context context, String settingsSecureKey) {
		final boolean enabled = Settings.Secure.getInt(context.getContentResolver(),
		settingsSecureKey, 0) == 1;
		final int resId = enabled ? R.string.accessibility_feature_state_on
		: R.string.accessibility_feature_state_off;
		return context.getResources().getText(resId);
		}
		}

+2 −6

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.settings.accessibility;
		import android.content.Context;
		import android.provider.Settings;

		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;

		public class CaptioningPreferenceController extends BasePreferenceController {
		@@ -35,10 +34,7 @@ public class CaptioningPreferenceController extends BasePreferenceController {

		@Override
		public CharSequence getSummary() {
		final boolean enabled = Settings.Secure.getInt(mContext.getContentResolver(),
		Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, 0) == 1;
		final int resId = enabled ? R.string.accessibility_feature_state_on
		: R.string.accessibility_feature_state_off;
		return mContext.getResources().getText(resId);
		return AccessibilityUtil.getSummary(mContext,
		Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED);
		}
		}

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 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.content.Context;
		import android.provider.Settings;

		import com.android.settings.core.BasePreferenceController;

		public class DaltonizerPreferenceController extends BasePreferenceController {

		public DaltonizerPreferenceController(Context context, String preferenceKey) {
		super(context, preferenceKey);
		}

		@Override
		public int getAvailabilityStatus() {
		return AVAILABLE_UNSEARCHABLE;
		}

		@Override
		public CharSequence getSummary() {
		return AccessibilityUtil.getSummary(mContext,
		Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
		}
		}
		No newline at end of file