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

Commit f1d0ce61 authored by Oleg Petšjonkin's avatar Oleg Petšjonkin Committed by Android (Google) Code Review
Browse files

Merge "Updating NightLight Intensity slider to SliderPreference component" into main

parents 2871b8df 0ec34ce1

res/xml/night_display_settings.xml

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

        settings:controller="com.android.settings.display.NightDisplayCustomEndTimePreferenceController"/>



    <com.android.settings.widget.SeekBarPreference

    <com.android.settingslib.widget.SliderPreference

        android:key="night_display_temperature"

        android:title="@string/night_display_temperature_title"

        settings:keywords="@string/keywords_display_night_display"

src/com/android/settings/display/NightDisplayIntensityPreferenceController.java

+5 −5
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ import androidx.preference.PreferenceScreen; 


import com.android.settings.R;

import com.android.settings.core.SliderPreferenceController;

import com.android.settings.widget.SeekBarPreference;

import com.android.settingslib.widget.SliderPreference;



public class NightDisplayIntensityPreferenceController extends SliderPreferenceController {



    private ColorDisplayManager mColorDisplayManager;

    private final ColorDisplayManager mColorDisplayManager;



    public NightDisplayIntensityPreferenceController(Context context, String key) {

        super(context, key);
@@ -64,11 +64,11 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

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

        preference.setContinuousUpdates(true);

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

        preference.setUpdatesContinuously(true);

        preference.setMax(getMax());

        preference.setMin(getMin());

        preference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);

        // TODO(b/394828723) add haptic feedback

    }



    @Override