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

feat(color correction): Disable slider when not applicable

Browse Source 
We received feedback that slider should be disabled when it's not
applicable, namely when it's off and when mode == gray scale.

Bug: 351920992
Test: Locally tested + unit tests
Flag: com.android.server.accessibility.enable_color_correction_saturation

Change-Id: I1162a501a797a1d2b30da76f0c75e5fdea3f61d2
This commit is contained in:
Isaac Chai
2024-07-11 00:16:50 +00:00
parent 27b5476bbf
commit 581fbc8dfa
3 changed files with 298 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceController.java
View File

@@ -17,26 +17,50 @@ package com.android.settings.accessibility;
import android.content.ContentResolver;
import android.content.Context;
import android.database.ContentObserver;
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.server.accessibility.Flags;
import com.android.settings.R;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
/**
* The controller of the seekbar preference for the saturation level of color correction.
*/
public class DaltonizerSaturationSeekbarPreferenceController extends SliderPreferenceController {
public class DaltonizerSaturationSeekbarPreferenceController
extends SliderPreferenceController
implements DefaultLifecycleObserver {
private static final int DEFAULT_SATURATION_LEVEL = 7;
private static final int SATURATION_MAX = 10;
private static final int SATURATION_MIN = 0;
private static final int SATURATION_MIN = 1;
private int mSliderPosition;
private final ContentResolver mContentResolver;
@Nullable
private SeekBarPreference mPreference;
public final ContentObserver mContentObserver = new ContentObserver(
new Handler(Looper.getMainLooper())) {
@Override
public void onChange(boolean selfChange) {
if (mPreference != null) {
updateState(mPreference);
}
}
};
public DaltonizerSaturationSeekbarPreferenceController(Context context,
String preferenceKey) {
super(context, preferenceKey);
@@ -49,10 +73,33 @@ public class DaltonizerSaturationSeekbarPreferenceController extends SliderPrefe
// TODO: Observer color correction on/off and enable/disable based on secure settings.
}
@Override
public void onStart(@NonNull LifecycleOwner owner) {
if (!isAvailable()) return;
mContentResolver.registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER),
true,
mContentObserver
);
mContentResolver.registerContentObserver(
Settings.Secure.getUriFor(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED),
true,
mContentObserver
);
}
@Override
public void onStop(@NonNull LifecycleOwner owner) {
if (!isAvailable()) return;
mContentResolver.unregisterContentObserver(mContentObserver);
mPreference = null;
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
SeekBarPreference preference = screen.findPreference(getPreferenceKey());
mPreference = preference;
preference.setMax(getMax());
preference.setMin(getMin());
preference.setProgress(mSliderPosition);
@@ -62,7 +109,7 @@ public class DaltonizerSaturationSeekbarPreferenceController extends SliderPrefe
@Override
public int getAvailabilityStatus() {
if (Flags.enableColorCorrectionSaturation()) {
return AVAILABLE;
return shouldSeekBarEnabled() ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
}
return CONDITIONALLY_UNAVAILABLE;
}
@@ -85,6 +132,21 @@ public class DaltonizerSaturationSeekbarPreferenceController extends SliderPrefe
return true;
}
@Override
public void updateState(Preference preference) {
if (preference == null) {
return;
}
var shouldSeekbarEnabled = shouldSeekBarEnabled();
// setSummary not working yet on SeekBarPreference.
String summary = shouldSeekbarEnabled
? ""
: mContext.getString(R.string.daltonizer_saturation_unavailable_summary);
preference.setSummary(summary);
preference.setEnabled(shouldSeekbarEnabled);
}
@Override
public int getMax() {
return SATURATION_MAX;
@@ -94,4 +156,16 @@ public class DaltonizerSaturationSeekbarPreferenceController extends SliderPrefe
public int getMin() {
return SATURATION_MIN;
}
private boolean shouldSeekBarEnabled() {
int enabled = Settings.Secure.getInt(
mContentResolver, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0);
int mode = Settings.Secure.getInt(
mContentResolver, Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER, -1);
// enabled == 0 is disabled and also default.
// mode == 0 is gray scale where saturation level isn't applicable.
// mode == -1 is disabled and also default.
return enabled != 0 && mode != -1 && mode != 0;
}
}