fix(Color correction): Display default value in slider to match the radio button
The default value for display in the radio buttons were hard-coded and was not being reflected to the slider correctly. Bug: 359379399 Test: locally tested + unit tests added Flag: com.android.server.accessibility.enable_color_correction_saturation Change-Id: I95bd0ae1d32561dbbf6b4e87efe70595c9566de8
This commit is contained in:
@@ -24,7 +24,6 @@ import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.provider.Settings;
|
||||
import android.view.View;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.lifecycle.DefaultLifecycleObserver;
|
||||
@@ -36,8 +35,6 @@ import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.widget.SelectorWithWidgetPreference;
|
||||
|
||||
import com.google.common.primitives.Ints;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -70,17 +67,6 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon
|
||||
};
|
||||
}
|
||||
|
||||
protected static int getSecureAccessibilityDaltonizerValue(ContentResolver resolver) {
|
||||
final String daltonizerStringValue = Settings.Secure.getString(
|
||||
resolver, DALTONIZER_TYPE_SETTINGS_KEY);
|
||||
if (daltonizerStringValue == null) {
|
||||
return AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY;
|
||||
}
|
||||
final Integer daltonizerIntValue = Ints.tryParse(daltonizerStringValue);
|
||||
return daltonizerIntValue == null ? AccessibilityManager.DALTONIZER_CORRECT_DEUTERANOMALY
|
||||
: daltonizerIntValue;
|
||||
}
|
||||
|
||||
private Map<String, Integer> getDaltonizerValueToKeyMap() {
|
||||
if (mAccessibilityDaltonizerKeyToValueMap.isEmpty()) {
|
||||
|
||||
@@ -123,7 +109,8 @@ public class DaltonizerRadioButtonPreferenceController extends BasePreferenceCon
|
||||
}
|
||||
|
||||
private int getAccessibilityDaltonizerValue() {
|
||||
final int daltonizerValue = getSecureAccessibilityDaltonizerValue(mContentResolver);
|
||||
final int daltonizerValue =
|
||||
DaltonizerPreferenceUtil.getSecureAccessibilityDaltonizerValue(mContentResolver);
|
||||
return daltonizerValue;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user