Color correction improvement (2/n) (0eae5829) · Commits · e / os / android_packages_apps_Settings

res/values/arrays.xml

+7 −7

Original line number	Diff line number	Diff line
		@@ -1014,19 +1014,19 @@
		<item>\?</item>
		</string-array>

		<!-- Display color space adjustment modes for accessibility -->
		<string-array name="daltonizer_type_entries" translatable="false">
		<item>@string/daltonizer_mode_deuteranomaly</item>
		<item>@string/daltonizer_mode_protanomaly</item>
		<item>@string/daltonizer_mode_tritanomaly</item>
		<!-- Keys for color space adjustment modes for accessibility -->
		<string-array name="daltonizer_mode_keys" translatable="false">
		<item>daltonizer_mode_deuteranomaly</item>
		<item>daltonizer_mode_protanomaly</item>
		<item>daltonizer_mode_tritanomaly</item>
		</string-array>

		<!-- Values for display color space adjustment modes for accessibility -->
		<string-array name="daltonizer_type_values" translatable="false">
		<integer-array name="daltonizer_type_values" translatable="false">
		<item>12</item>
		<item>11</item>
		<item>13</item>
		</string-array>
		</integer-array>

		<!-- Battery saver mode: allowable trigger threshold levels. -->
		<integer-array name="battery_saver_trigger_values" translatable="false" >

res/values/strings.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -4922,6 +4922,18 @@
		<string name="enable_quick_setting">Show in Quick Settings</string>
		<!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
		<string name="daltonizer_type">Correction mode</string>
		<!-- Title shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
		<string name="daltonizer_mode_deuteranomaly_title">Red-green</string>
		<!-- Title shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
		<string name="daltonizer_mode_protanomaly_title">Green-red</string>
		<!-- Title shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
		<string name="daltonizer_mode_tritanomaly_title">Blue-yellow</string>
		<!-- Summary shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
		<string name="daltonizer_mode_deuteranomaly_summary">Deuteranomaly</string>
		<!-- Summary shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
		<string name="daltonizer_mode_protanomaly_summary">Protanomaly</string>
		<!-- Summary shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
		<string name="daltonizer_mode_tritanomaly_summary">Tritanomaly</string>

		<!-- Subtitle for the accessibility preference to configure feature that performs click action soon after mouse/trackpad pointer stops moving, in case delay before click is extremely short. Placeholder will be set to the number of milliseconds to which the delay amounts. [CHAR LIMIT=NONE] -->
		<plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay">

res/xml/accessibility_daltonizer_settings.xml

+22 −9

Original line number	Diff line number	Diff line
		@@ -18,19 +18,32 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="daltonizer_preference_screen"
		android:persistent="false"
		android:title="@string/accessibility_display_daltonizer_preference_title">

		<ListPreference
		android:entries="@array/daltonizer_type_entries"
		android:entryValues="@array/daltonizer_type_values"
		android:key="type"
		android:summary="%s"
		android:title="@string/daltonizer_type"
		android:icon="@drawable/ic_accessibility_illustration_colorblind" />
		<com.android.settingslib.widget.RadioButtonPreference
		android:key="daltonizer_mode_deuteranomaly"
		android:persistent="false"
		android:summary="@string/daltonizer_mode_deuteranomaly_summary"
		android:title="@string/daltonizer_mode_deuteranomaly_title"
		settings:allowDividerAbove="true" />

		<com.android.settingslib.widget.RadioButtonPreference
		android:key="daltonizer_mode_protanomaly"
		android:persistent="false"
		android:summary="@string/daltonizer_mode_protanomaly_summary"
		android:title="@string/daltonizer_mode_protanomaly_title" />

		<com.android.settingslib.widget.RadioButtonPreference
		android:key="daltonizer_mode_tritanomaly"
		android:persistent="false"
		android:summary="@string/daltonizer_mode_tritanomaly_summary"
		android:title="@string/daltonizer_mode_tritanomaly_title" />

		<com.android.settingslib.widget.FooterPreference
		android:key="daltonizer_footer"
		android:title="@string/accessibility_display_daltonizer_preference_subtitle"
		android:persistent="false"
		android:selectable="false"
		android:title="@string/accessibility_display_daltonizer_preference_subtitle"
		settings:searchable="false" />
		</PreferenceScreen>

res/xml/accessibility_settings.xml

+56 −33

Original line number	Diff line number	Diff line
		@@ -18,68 +18,78 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:settings="http://schemas.android.com/apk/res-auto"
		android:key="accessibility_settings_screen"
		android:title="@string/accessibility_settings"
		android:persistent="true">
		android:persistent="false"
		android:title="@string/accessibility_settings">

		<Preference
		android:fragment="com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment"
		android:key="accessibility_shortcut_preference"
		android:persistent="false"
		android:title="@string/accessibility_global_gesture_preference_title"
		android:fragment="com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment"
		settings:controller="com.android.settings.accessibility.AccessibilityShortcutPreferenceController"/>

		<PreferenceCategory
		android:key="user_installed_services_category"
		android:title="@string/user_installed_services_category_title">
		</PreferenceCategory>
		android:persistent="false"
		android:title="@string/user_installed_services_category_title"/>

		<PreferenceCategory
		android:key="screen_reader_category"
		android:persistent="false"
		android:title="@string/screen_reader_category_title">

		<Preference
		android:fragment="com.android.settings.tts.TextToSpeechSettings"
		android:key="tts_settings_preference"
		android:persistent="false"
		android:title="@string/tts_settings_title"
		android:fragment="com.android.settings.tts.TextToSpeechSettings"
		settings:controller="com.android.settings.language.TtsPreferenceController"/>
		</PreferenceCategory>

		<PreferenceCategory
		android:key="display_category"
		android:persistent="false"
		android:title="@string/display_category_title">

		<Preference
		android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
		android:key="font_size_preference_screen"
		android:persistent="false"
		android:title="@string/title_font_size"
		android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
		settings:controller="com.android.settings.display.FontSizePreferenceController"
		settings:searchable="false"/>

		<com.android.settings.display.ScreenZoomPreference
		android:key="accessibility_settings_screen_zoom"
		android:fragment="com.android.settings.display.ScreenZoomSettings"
		android:key="accessibility_settings_screen_zoom"
		android:persistent="false"
		android:title="@string/screen_zoom_title"
		settings:searchable="false"/>

		<SwitchPreference
		android:key="dark_ui_mode_accessibility"
		android:persistent="false"
		android:title="@string/dark_ui_mode"
		settings:controller="com.android.settings.display.DarkUIPreferenceController"
		settings:searchable="false"/>

		<Preference
		android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
		android:icon="@drawable/ic_accessibility_magnification"
		android:key="magnification_preference_screen"
		android:persistent="false"
		android:title="@string/accessibility_screen_magnification_title"
		android:icon="@drawable/ic_accessibility_magnification"
		android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
		settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>

		<SwitchPreference
		android:key="toggle_large_pointer_icon"
		android:persistent="false"
		android:title="@string/accessibility_toggle_large_pointer_icon_title"
		settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>

		<SwitchPreference
		android:key="toggle_disable_animations"
		android:persistent="false"
		android:title="@string/accessibility_disable_animations"
		settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>

		@@ -87,111 +97,124 @@

		<PreferenceCategory
		android:key="interaction_control_category"
		android:persistent="false"
		android:title="@string/interaction_control_category_title">

		<Preference
		android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
		android:key="autoclick_preference"
		android:persistent="false"
		android:title="@string/accessibility_autoclick_preference_title"
		android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
		settings:controller="com.android.settings.accessibility.AutoclickPreferenceController"/>

		<SwitchPreference
		android:key="toggle_power_button_ends_call_preference"
		android:title="@string/accessibility_power_button_ends_call_prerefence_title"
		android:persistent="false"
		android:title="@string/accessibility_power_button_ends_call_prerefence_title"
		settings:controller="com.android.settings.accessibility.PowerButtonEndsCallPreferenceController"/>

		<SwitchPreference
		android:key="toggle_lock_screen_rotation_preference"
		android:title="@string/accelerometer_title"
		android:persistent="false"
		android:title="@string/accelerometer_title"
		settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>

		<ListPreference
		android:key="select_long_press_timeout_preference"
		android:title="@string/accessibility_long_press_timeout_preference_title"
		android:entries="@array/long_press_timeout_selector_titles"
		android:entryValues="@array/long_press_timeout_selector_values"
		android:key="select_long_press_timeout_preference"
		android:persistent="false"
		android:title="@string/accessibility_long_press_timeout_preference_title"
		settings:controller="com.android.settings.accessibility.SelectLongPressTimeoutPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
		android:key="accessibility_control_timeout_preference_fragment"
		android:title="@string/accessibility_setting_item_control_timeout_title"
		android:persistent="false"
		android:fragment="com.android.settings.accessibility.AccessibilityControlTimeoutPreferenceFragment"
		android:title="@string/accessibility_setting_item_control_timeout_title"
		settings:controller="com.android.settings.accessibility.AccessibilityTimeoutPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.accessibility.VibrationSettings"
		android:key="vibration_preference_screen"
		android:persistent="false"
		android:title="@string/accessibility_vibration_settings_title"
		android:fragment="com.android.settings.accessibility.VibrationSettings"
		settings:controller="com.android.settings.accessibility.VibrationPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
		android:key="gesture_system_navigation_input_summary_accessibility"
		android:persistent="false"
		android:title="@string/system_navigation_title"
		android:fragment="com.android.settings.gestures.SystemNavigationGestureSettings"
		settings:controller="com.android.settings.gestures.SystemNavigationPreferenceController"/>

		</PreferenceCategory>

		<PreferenceCategory
		android:key="audio_and_captions_category"
		android:persistent="false"
		android:title="@string/audio_and_captions_category_title">

		<Preference
		android:key="live_caption"
		android:title="@string/live_caption_title"
		android:persistent="false"
		android:summary="@string/live_caption_summary"
		android:title="@string/live_caption_title"
		settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>

		<SwitchPreference
		android:key="toggle_master_mono"
		android:title="@string/accessibility_toggle_master_mono_title"
		android:summary="@string/accessibility_toggle_master_mono_summary"
		android:persistent="false"
		android:summary="@string/accessibility_toggle_master_mono_summary"
		android:title="@string/accessibility_toggle_master_mono_title"
		settings:controller="com.android.settings.accessibility.MasterMonoPreferenceController"/>

		<com.android.settings.accessibility.BalanceSeekBarPreference
		android:key="seekbar_master_balance"
		android:persistent="false"
		android:title="@string/accessibility_toggle_master_balance_title"/>

		<Preference
		android:key="hearing_aid_preference"
		android:persistent="false"
		android:summary="@string/accessibility_hearingaid_not_connected_summary"
		android:title="@string/accessibility_hearingaid_title"
		settings:controller="com.android.settings.accessibility.AccessibilityHearingAidPreferenceController"/>

		<Preference
		android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
		android:key="captioning_preference_screen"
		android:persistent="false"
		android:title="@string/accessibility_captioning_title"
		android:fragment="com.android.settings.accessibility.CaptionPropertiesFragment"
		settings:controller="com.android.settings.accessibility.CaptioningPreferenceController"/>

		</PreferenceCategory>

		<PreferenceCategory
		android:key="experimental_category"
		android:persistent="false"
		android:title="@string/experimental_category_title">

		<SwitchPreference
		android:key="toggle_high_text_contrast_preference"
		android:persistent="false"
		android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
		settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>

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

		<SwitchPreference
		android:icon="@drawable/ic_color_inversion"
		android:key="toggle_inversion_preference"
		android:title="@string/accessibility_display_inversion_preference_title"
		android:summary="@string/accessibility_display_inversion_preference_subtitle"
		android:persistent="false"
		android:icon="@drawable/ic_color_inversion"
		android:summary="@string/accessibility_display_inversion_preference_subtitle"
		android:title="@string/accessibility_display_inversion_preference_title"
		settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
		</PreferenceCategory>
		</PreferenceScreen>

src/com/android/settings/accessibility/DaltonizerPreferenceController.java

+124 −6

Original line number	Diff line number	Diff line
		@@ -16,25 +16,143 @@

		package com.android.settings.accessibility;

		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.res.Resources;
		import android.provider.Settings;
		import android.view.accessibility.AccessibilityManager;

		import androidx.lifecycle.LifecycleObserver;
		import androidx.preference.Preference;
		import androidx.preference.PreferenceScreen;

		import com.android.settings.R;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.widget.RadioButtonPreference;

		import com.google.common.primitives.Ints;

		import java.util.HashMap;
		import java.util.Map;

		/** Controller class that control accessibility daltonizer settings. */
		public class DaltonizerPreferenceController extends BasePreferenceController implements
		LifecycleObserver, RadioButtonPreference.OnClickListener {
		private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;

		// pair the preference key and daltonizer value.
		private final Map<String, Integer> mAccessibilityDaltonizerKeyToValueMap = new HashMap<>();

		public class DaltonizerPreferenceController extends BasePreferenceController {
		// RadioButtonPreference key, each preference represent a daltonizer value.
		private final ContentResolver mContentResolver;
		private final Resources mResources;
		private DaltonizerPreferenceController.OnChangeListener mOnChangeListener;
		private RadioButtonPreference mPreference;
		private int mAccessibilityDaltonizerValue;

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

		mContentResolver = context.getContentResolver();
		mResources = context.getResources();

		if (lifecycle != null) {
		lifecycle.addObserver(this);
		}
		}

		protected static int getSecureAccessibilityDaltonizerValue(ContentResolver resolver,
		String name) {
		final String daltonizerStringValue = Settings.Secure.getString(resolver, name);
		if (daltonizerStringValue == null) {
		return AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
		}
		final Integer daltonizerIntValue = Ints.tryParse(daltonizerStringValue);
		return daltonizerIntValue == null ? AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY
		: daltonizerIntValue;
		}

		public void setOnChangeListener(DaltonizerPreferenceController.OnChangeListener listener) {
		mOnChangeListener = listener;
		}

		private Map<String, Integer> getDaltonizerValueToKeyMap() {
		if (mAccessibilityDaltonizerKeyToValueMap.size() == 0) {

		final String[] daltonizerKeys = mResources.getStringArray(
		R.array.daltonizer_mode_keys);

		final int[] daltonizerValues = mResources.getIntArray(
		R.array.daltonizer_type_values);

		final int daltonizerValueCount = daltonizerValues.length;
		for (int i = 0; i < daltonizerValueCount; i++) {
		mAccessibilityDaltonizerKeyToValueMap.put(daltonizerKeys[i], daltonizerValues[i]);
		}
		}
		return mAccessibilityDaltonizerKeyToValueMap;
		}

		private void putSecureString(String name, String value) {
		Settings.Secure.putString(mContentResolver, name, value);
		}

		private void handlePreferenceChange(String value) {
		putSecureString(TYPE, value);
		}

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

		@Override
		public void displayPreference(PreferenceScreen screen) {
		super.displayPreference(screen);
		mPreference = (RadioButtonPreference)
		screen.findPreference(getPreferenceKey());
		mPreference.setOnClickListener(this);
		updateState(mPreference);
		}

		@Override
		public void onRadioButtonClicked(RadioButtonPreference preference) {
		final int value = getDaltonizerValueToKeyMap().get(mPreferenceKey);
		handlePreferenceChange(String.valueOf(value));
		if (mOnChangeListener != null) {
		mOnChangeListener.onCheckedChanged(mPreference);
		}
		}

		private int getAccessibilityDaltonizerValue() {
		final int daltonizerValue = getSecureAccessibilityDaltonizerValue(mContentResolver,
		TYPE);
		return daltonizerValue;
		}

		protected void updatePreferenceCheckedState(int value) {
		if (mAccessibilityDaltonizerValue == value) {
		mPreference.setChecked(true);
		}
		}

		@Override
		public CharSequence getSummary() {
		return AccessibilityUtil.getSummary(mContext,
		Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
		public void updateState(Preference preference) {
		super.updateState(preference);
		mAccessibilityDaltonizerValue = getAccessibilityDaltonizerValue();

		// reset RadioButton
		mPreference.setChecked(false);
		final int preferenceValue = getDaltonizerValueToKeyMap().get(mPreference.getKey());
		updatePreferenceCheckedState(preferenceValue);
		}

		/** Listener interface handles checked event. */
		public interface OnChangeListener {
		/** A hook that is called when preference checked.*/
		void onCheckedChanged(Preference preference);
		}

		}
		No newline at end of file