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

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

Browse Source
This commit is contained in:
Oleg Petšjonkin
2025-03-05 08:03:34 -08:00
committed by Android (Google) Code Review
parent 2871b8dfce 0ec34ce1d7
commit f1d0ce612b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/night_display_settings.xml
View File

@@ -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"

10
src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
View File

@@ -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