Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64f07e75 authored by Daniel Norman's avatar Daniel Norman
Browse files

feat(expressive): Replace a11y SeekBar prefs with Slider prefs. 

Fix: 375168747
Test: atest com.android.settings.accessibility
Test: observe new sliders and their interaction with the preview;
      see attachments in bug
Test: use TalkBack to interact with sliders; observe state is announced
Flag: EXEMPT refactoring with user-visible differences only visible
      when the Settings expressive flag is enabled
Change-Id: I5b92bc3b06b591ee23f5631b9829148b8714159e
parent cb749a9c

res/xml/accessibility_button_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
        android:title="@string/accessibility_button_fade_title"

        settings:controller="com.android.settings.accessibility.FloatingMenuFadePreferenceController" />



    <com.android.settings.widget.SeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="accessibility_button_opacity"

        android:persistent="false"

        android:title="@string/accessibility_button_opacity_title"

res/xml/accessibility_daltonizer_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ 
        android:title="@string/accessibility_daltonizer_primary_switch_title"

        settings:controller="com.android.settings.accessibility.DaltonizerMainSwitchPreferenceController" />



    <com.android.settings.widget.SeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="daltonizer_saturation"

        android:persistent="false"

        android:title="@string/daltonizer_saturation_title"

        settings:controller="com.android.settings.accessibility.DaltonizerSaturationSeekbarPreferenceController" />

        settings:controller="com.android.settings.accessibility.DaltonizerSaturationSliderPreferenceController" />



    <com.android.settingslib.widget.SelectorWithWidgetPreference

        android:key="daltonizer_mode_deuteranomaly"

res/xml/accessibility_text_reading_options.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:key="display_text_size"

        android:title="@string/category_title_display_text_size">



        <com.android.settings.accessibility.AccessibilitySeekBarPreference

        <com.android.settings.accessibility.TooltipSliderPreference

            android:key="font_size"

            android:summary="@string/short_summary_font_size"

            android:title="@string/title_font_size"
@@ -39,7 +39,7 @@ 
            settings:iconStartContentDescription="@string/font_size_make_smaller_desc"

            settings:keywords="@string/keywords_font_size" />



        <com.android.settings.accessibility.AccessibilitySeekBarPreference

        <com.android.settings.accessibility.TooltipSliderPreference

            android:key="display_size"

            android:summary="@string/screen_zoom_short_summary"

            android:title="@string/screen_zoom_title"

src/com/android/settings/accessibility/DaltonizerSaturationSeekbarPreferenceController.java→src/com/android/settings/accessibility/DaltonizerSaturationSliderPreferenceController.java

+8 −8
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ 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;

import com.android.settingslib.widget.SliderPreference;



/**

 * The controller of the seekbar preference for the saturation level of color correction.

 */

public class DaltonizerSaturationSeekbarPreferenceController

public class DaltonizerSaturationSliderPreferenceController

        extends SliderPreferenceController

        implements DefaultLifecycleObserver {
@@ -52,7 +52,7 @@ public class DaltonizerSaturationSeekbarPreferenceController 
    private final ContentResolver mContentResolver;



    @Nullable

    private SeekBarPreference mPreference;

    private SliderPreference mPreference;



    public final ContentObserver mContentObserver = new ContentObserver(

            new Handler(Looper.getMainLooper())) {
@@ -64,8 +64,8 @@ public class DaltonizerSaturationSeekbarPreferenceController 
        }

    };



    public DaltonizerSaturationSeekbarPreferenceController(Context context,

            String preferenceKey) {

    public DaltonizerSaturationSliderPreferenceController(@NonNull Context context,

            @NonNull String preferenceKey) {

        super(context, preferenceKey);

        mContentResolver = context.getContentResolver();

        mSliderPosition = Settings.Secure.getInt(
@@ -101,12 +101,12 @@ public class DaltonizerSaturationSeekbarPreferenceController 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        SeekBarPreference preference = screen.findPreference(getPreferenceKey());

        SliderPreference preference = screen.findPreference(getPreferenceKey());

        mPreference = preference;

        preference.setMax(getMax());

        preference.setMin(getMin());

        preference.setProgress(mSliderPosition);

        preference.setContinuousUpdates(true);

        preference.setValue(mSliderPosition);

        preference.setUpdatesContinuously(true);

    }



    @Override

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

+5 −5
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ import androidx.annotation.VisibleForTesting; 
import androidx.preference.PreferenceScreen;



import com.android.settings.core.SliderPreferenceController;

import com.android.settings.widget.SeekBarPreference;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnPause;

import com.android.settingslib.core.lifecycle.events.OnResume;

import com.android.settingslib.widget.SliderPreference;



/** Preference controller that controls the transparency seekbar in accessibility button page. */

/** Preference controller that controls the transparency slider in accessibility button page. */

public class FloatingMenuTransparencyPreferenceController extends SliderPreferenceController

        implements LifecycleObserver, OnResume, OnPause {
@@ -51,7 +51,7 @@ public class FloatingMenuTransparencyPreferenceController extends SliderPreferen 
    private final ContentResolver mContentResolver;

    @VisibleForTesting

    final ContentObserver mContentObserver;

    private SeekBarPreference mPreference;

    private SliderPreference mPreference;



    public FloatingMenuTransparencyPreferenceController(Context context,

            String preferenceKey) {
@@ -76,10 +76,10 @@ public class FloatingMenuTransparencyPreferenceController extends SliderPreferen 
        super.displayPreference(screen);



        mPreference = screen.findPreference(getPreferenceKey());

        mPreference.setContinuousUpdates(true);

        mPreference.setUpdatesContinuously(true);

        mPreference.setMax(getMax());

        mPreference.setMin(getMin());

        mPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);

        mPreference.setHapticFeedbackMode(SliderPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);



        updateAvailabilityStatus();

        updateState(mPreference);