Merge "refactor: Modify ToggleDaltonizerPreferenceFragment to plain... (2f618e74) · Commits · e / os / android_packages_apps_Settings

res/xml/accessibility_daltonizer_settings.xml

+32 −6

Original line number	Diff line number	Diff line
		@@ -20,6 +20,11 @@
		android:persistent="false"
		android:title="@string/accessibility_display_daltonizer_preference_title">

		<com.android.settingslib.widget.TopIntroPreference
		android:key="top_intro"
		android:title="@string/accessibility_daltonizer_about_intro_text"
		settings:searchable="false" />

		<com.android.settings.accessibility.PaletteListPreference
		android:key="daltonizer_preview"
		android:persistent="false"
		@@ -28,6 +33,17 @@
		settings:allowDividerBelow="true"
		settings:searchable="false"/>

		<com.android.settingslib.widget.MainSwitchPreference
		android:key="daltonizer_switch_preference_key"
		android:title="@string/accessibility_daltonizer_primary_switch_title"
		settings:controller="com.android.settings.accessibility.DaltonizerMainSwitchPreferenceController" />

		<com.android.settings.widget.SeekBarPreference
		android:key="daltonizer_saturation"
		android:persistent="false"
		android:title="@string/daltonizer_saturation_title"
		settings:controller="com.android.settings.accessibility.DaltonizerSaturationSeekbarPreferenceController" />

		<com.android.settingslib.widget.SelectorWithWidgetPreference
		android:key="daltonizer_mode_deuteranomaly"
		android:persistent="false"
		@@ -59,10 +75,20 @@
		settings:titleMaxLines="@integer/max_integer"
		settings:controller="com.android.settings.accessibility.DaltonizerRadioButtonPreferenceController" />

		<com.android.settings.widget.SeekBarPreference
		android:key="daltonizer_saturation"
		<PreferenceCategory
		android:key="general_categories"
		android:title="@string/accessibility_screen_option"
		settings:searchable="false">
		<com.android.settings.accessibility.ShortcutPreference
		android:key="daltonizer_shortcut_key"
		android:persistent="false"
		android:title="@string/daltonizer_saturation_title"
		settings:controller="com.android.settings.accessibility.DaltonizerSaturationSeekbarPreferenceController"
		/>
		android:title="@string/accessibility_daltonizer_shortcut_title"
		settings:controller="com.android.settings.accessibility.ToggleShortcutPreferenceController" />
		</PreferenceCategory>

		<com.android.settings.accessibility.AccessibilityFooterPreference
		android:key="html_description"
		settings:controller="com.android.settings.accessibility.DaltonizerFooterPreferenceController"
		settings:searchable="false" />

		</PreferenceScreen>

src/com/android/settings/accessibility/HtmlFooterPreferenceController.kt

+16 −0

Original line number	Diff line number	Diff line
		@@ -66,3 +66,19 @@ class ColorInversionFooterPreferenceController(context: Context, prefKey: String
		)
		}
		}

		class DaltonizerFooterPreferenceController(context: Context, prefKey: String) :
		HtmlFooterPreferenceController(context, prefKey) {
		init {
		introductionTitle = context.getString(R.string.accessibility_daltonizer_about_title)
		summary = context.getText(
		com.android.settingslib.R
		.string.accessibility_display_daltonizer_preference_subtitle)
		setupHelpLink(
		R.string.help_url_color_correction,
		context.getString(
		R.string.accessibility_daltonizer_footer_learn_more_content_description
		),
		)
		}
		}

src/com/android/settings/accessibility/SimpleSettingSwitchPreferenceController.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -116,3 +116,11 @@ class ColorInversionMainSwitchPreferenceController(context: Context, prefKey: St
		override fun getComponentName(): ComponentName =
		AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME
		}

		class DaltonizerMainSwitchPreferenceController(context: Context, prefKey: String) :
		SimpleSettingSwitchPreferenceController(context, prefKey) {
		override fun getSettingKey(): String = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED

		override fun getComponentName(): ComponentName =
		AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME
		}

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

+11 −155

Original line number	Diff line number	Diff line
		@@ -17,75 +17,23 @@
		package com.android.settings.accessibility;

		import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME;
		import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_TILE_COMPONENT_NAME;
		import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
		import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
		import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
		import static com.android.settings.accessibility.DaltonizerPreferenceUtil.isSecureAccessibilityDaltonizerEnabled;

		import android.app.settings.SettingsEnums;
		import android.content.ComponentName;
		import android.content.Context;
		import android.os.Bundle;
		import android.provider.Settings;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;

		import androidx.annotation.VisibleForTesting;
		import androidx.annotation.NonNull;

		import com.android.settings.R;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.widget.SettingsMainSwitchPreference;
		import com.android.settingslib.search.SearchIndexable;
		import com.android.settingslib.search.SearchIndexableRaw;

		import java.util.ArrayList;
		import java.util.List;

		/** Settings for daltonizer. */
		@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
		public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment {
		public class ToggleDaltonizerPreferenceFragment extends ShortcutFragment {

		private static final String TAG = "ToggleDaltonizerPreferenceFragment";
		private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
		private static final String KEY_PREVIEW = "daltonizer_preview";
		private static final String KEY_DEUTERANOMALY = "daltonizer_mode_deuteranomaly";
		private static final String KEY_PROTANOMALY = "daltonizer_mode_protanomaly";
		private static final String KEY_TRITANOMEALY = "daltonizer_mode_tritanomaly";
		private static final String KEY_GRAYSCALE = "daltonizer_mode_grayscale";

		@VisibleForTesting
		static final String KEY_SHORTCUT_PREFERENCE = "daltonizer_shortcut_key";
		@VisibleForTesting
		static final String KEY_SWITCH_PREFERENCE = "daltonizer_switch_preference_key";
		@VisibleForTesting
		static final String KEY_SATURATION = "daltonizer_saturation";

		@Override
		protected void registerKeysToObserverCallback(
		AccessibilitySettingsContentObserver contentObserver) {
		super.registerKeysToObserverCallback(contentObserver);

		final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1);
		enableServiceFeatureKeys.add(ENABLED);
		contentObserver.registerKeysToObserverCallback(enableServiceFeatureKeys,
		key -> updateSwitchBarToggleSwitch());
		}

		@Override
		public View onCreateView(LayoutInflater inflater, ViewGroup container,
		Bundle savedInstanceState) {
		mComponentName = DALTONIZER_COMPONENT_NAME;
		mFeatureName = getText(com.android.settingslib.R
		.string.accessibility_display_daltonizer_preference_title);
		mHtmlDescription = getText(com.android.settingslib.R
		.string.accessibility_display_daltonizer_preference_subtitle);
		mTopIntroTitle = getText(R.string.accessibility_daltonizer_about_intro_text);
		final View view = super.onCreateView(inflater, container, savedInstanceState);
		updateFooterPreference();
		return view;
		}

		@Override
		public void onViewCreated(View view, Bundle savedInstanceState) {
		@@ -97,37 +45,17 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
		}
		}

		private void updateFooterPreference() {
		final String title = getPrefContext()
		.getString(R.string.accessibility_daltonizer_about_title);
		final String learnMoreText = getPrefContext()
		.getString(R.string.accessibility_daltonizer_footer_learn_more_content_description);
		mFooterPreferenceController.setIntroductionTitle(title);
		mFooterPreferenceController.setupHelpLink(getHelpResource(), learnMoreText);
		mFooterPreferenceController.displayPreference(getPreferenceScreen());
		}

		/** Customizes the order by preference key. */
		protected List<String> getPreferenceOrderList() {
		final List<String> lists = new ArrayList<>();
		lists.add(KEY_TOP_INTRO_PREFERENCE);
		lists.add(KEY_PREVIEW);
		lists.add(getUseServicePreferenceKey());
		// Putting saturation level close to the preview so users can see what is changing.
		lists.add(KEY_SATURATION);
		lists.add(KEY_DEUTERANOMALY);
		lists.add(KEY_PROTANOMALY);
		lists.add(KEY_TRITANOMEALY);
		lists.add(KEY_GRAYSCALE);
		lists.add(KEY_GENERAL_CATEGORY);
		lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);
		return lists;
		@NonNull
		@Override
		public CharSequence getFeatureName() {
		return getText(com.android.settingslib.R
		.string.accessibility_display_daltonizer_preference_title);
		}

		@NonNull
		@Override
		public void onResume() {
		super.onResume();
		updateSwitchBarToggleSwitch();
		public ComponentName getFeatureComponentName() {
		return DALTONIZER_COMPONENT_NAME;
		}

		@Override
		@@ -150,78 +78,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
		return TAG;
		}

		@Override
		protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
		final boolean isEnabled =
		isSecureAccessibilityDaltonizerEnabled(getContentResolver());
		if (enabled == isEnabled) {
		return;
		}
		logAccessibilityServiceEnabled(mComponentName, enabled);
		Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? ON : OFF);
		}

		@Override
		protected void onRemoveSwitchPreferenceToggleSwitch() {
		super.onRemoveSwitchPreferenceToggleSwitch();
		mToggleServiceSwitchPreference.setOnPreferenceClickListener(null);
		}

		@Override
		protected void updateToggleServiceTitle(SettingsMainSwitchPreference switchPreference) {
		switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
		}

		@Override
		protected String getUseServicePreferenceKey() {
		return KEY_SWITCH_PREFERENCE;
		}

		@Override
		protected CharSequence getShortcutTitle() {
		return getText(R.string.accessibility_daltonizer_shortcut_title);
		}

		@Override
		int getUserShortcutTypes() {
		return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
		mComponentName);
		}

		@Override
		ComponentName getTileComponentName() {
		return DALTONIZER_TILE_COMPONENT_NAME;
		}

		@Override
		protected void updateSwitchBarToggleSwitch() {
		final boolean checked = Settings.Secure.getInt(getContentResolver(), ENABLED, OFF) == ON;
		if (mToggleServiceSwitchPreference.isChecked() == checked) {
		return;
		}
		mToggleServiceSwitchPreference.setChecked(checked);
		}

		public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
		new BaseSearchIndexProvider(R.xml.accessibility_daltonizer_settings) {
		@Override
		public List<SearchIndexableRaw> getRawDataToIndex(Context context,
		boolean enabled) {
		final List<SearchIndexableRaw> rawData =
		super.getRawDataToIndex(context, enabled);

		SearchIndexableRaw shortcutRaw = new SearchIndexableRaw(context);
		shortcutRaw.key = KEY_SHORTCUT_PREFERENCE;
		shortcutRaw.title = context.getString(
		R.string.accessibility_daltonizer_shortcut_title);
		rawData.add(shortcutRaw);

		SearchIndexableRaw mainSwitchRaw = new SearchIndexableRaw(context);
		mainSwitchRaw.key = KEY_SWITCH_PREFERENCE;
		mainSwitchRaw.title = context.getString(
		R.string.accessibility_daltonizer_primary_switch_title);
		rawData.add(mainSwitchRaw);
		return rawData;
		}
		};
		new BaseSearchIndexProvider(R.xml.accessibility_daltonizer_settings);
		}

tests/robotests/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,9 @@ android_robolectric_test {
		"resources",
		],

		// Required for TestParameterInjector
		javacflags: ["-parameters"],

		instrumentation_for: "SettingsRoboTestStub",

		test_options: {