PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Color correction improvement (2/n)

Browse Source 
Implement RadioButtonPreference and its controller to replace ListPreference
New strings for accessibility daltonizer service
- radio button title and summary

Bug: 145968068
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DaltonizerPreferenceControllerTest
Change-Id: Ic91d8648906f35991682a259879095cbbd4cc678
This commit is contained in:
menghanli
2019-12-10 19:55:13 +08:00
committed by Menghan Li
parent 65c7da6e5c
commit 0eae582909
7 changed files with 358 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/com/android/settings/accessibility/DaltonizerPreferenceController.java
View File

@@ -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;
public class DaltonizerPreferenceController extends BasePreferenceController {
import com.google.common.primitives.Ints;
public DaltonizerPreferenceController(Context context, String preferenceKey) {
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<>();
// 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, 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 CharSequence getSummary() {
return AccessibilityUtil.getSummary(mContext,
Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED);
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 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);
}
}

116
src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
View File

@@ -18,34 +18,56 @@ package com.android.settings.accessibility;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.hardware.display.ColorDisplayManager;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import android.content.res.Resources;
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.search.Indexable;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
@SearchIndexable
public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
private static final String TYPE = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER;
private static final int DEFAULT_TYPE = AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
private static final String KEY_DALTONIZER_FOOTER = "daltonizer_footer";
public final class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
implements DaltonizerPreferenceController.OnChangeListener,
SwitchBar.OnSwitchChangeListener {
private ListPreference mType;
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED;
private static final List<AbstractPreferenceController> sControllers = new ArrayList<>();
@Override
public void onCheckedChanged(Preference preference) {
for (AbstractPreferenceController controller : sControllers) {
controller.updateState(preference);
}
}
@Override
public void onResume() {
super.onResume();
for (AbstractPreferenceController controller :
buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
((DaltonizerPreferenceController) controller).setOnChangeListener(this);
((DaltonizerPreferenceController) controller).displayPreference(getPreferenceScreen());
}
}
@Override
public void onPause() {
super.onPause();
for (AbstractPreferenceController controller :
buildPreferenceControllers(getPrefContext(), getSettingsLifecycle())) {
((DaltonizerPreferenceController) controller).setOnChangeListener(null);
}
}
@Override
public int getMetricsCategory() {
@@ -57,16 +79,6 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
return R.string.help_url_color_correction;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mType = (ListPreference) findPreference("type");
final Preference footer = findPreference(KEY_DALTONIZER_FOOTER);
footer.setVisible(!ColorDisplayManager.isColorTransformAccelerated(getActivity()));
initPreferences();
}
@Override
protected int getPreferenceScreenResId() {
@@ -75,26 +87,7 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
@Override
protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 1 : 0);
}
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mType) {
Settings.Secure.putInt(getContentResolver(), TYPE, Integer.parseInt((String) newValue));
preference.setSummary("%s");
}
return true;
}
@Override
protected void onInstallSwitchBarToggleSwitch() {
super.onInstallSwitchBarToggleSwitch();
mSwitchBar.setCheckedInternal(
Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
mSwitchBar.addOnSwitchChangeListener(this);
Settings.Secure.putInt(getContentResolver(), ENABLED, enabled ? 0 : 1);
}
@Override
@@ -110,25 +103,34 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
switchBar.setSwitchBarText(switchBarText, switchBarText);
}
private void initPreferences() {
final String value = Integer.toString(
Settings.Secure.getInt(getContentResolver(), TYPE, DEFAULT_TYPE));
mType.setValue(value);
mType.setOnPreferenceChangeListener(this);
final int index = mType.findIndexOfValue(value);
if (index < 0) {
// We're using a mode controlled by developer preferences.
mType.setSummary(getString(R.string.daltonizer_type_overridden,
getString(R.string.simulate_color_space)));
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
Settings.Secure.putInt(getContentResolver(), ENABLED, isChecked ? 1 : 0);
}
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
onPreferenceToggled(mPreferenceKey, isChecked);
protected void onInstallSwitchBarToggleSwitch() {
super.onInstallSwitchBarToggleSwitch();
mSwitchBar.setCheckedInternal(
Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
mSwitchBar.addOnSwitchChangeListener(this);
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
if (sControllers.size() == 0) {
final Resources resources = context.getResources();
final String[] daltonizerKeys = resources.getStringArray(
R.array.daltonizer_mode_keys);
for (int i = 0; i < daltonizerKeys.length; i++) {
sControllers.add(new DaltonizerPreferenceController(
context, lifecycle, daltonizerKeys[i]));
}
}
return sControllers;
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.accessibility_daltonizer_settings);
}