From db2d3347d779ddb8563c26e2341244de200bd685 Mon Sep 17 00:00:00 2001
From: John Li <lijohn@google.com>
Date: Fri, 13 Nov 2020 09:53:49 +0800
Subject: [PATCH] Add haptic feedback for the seekbar in Settings.

- set HAPTIC_FEEDBACK_MODE_ON_TICKS for Gesture Navigation.
- set HAPTIC_FEEDBACK_MODE_ON_TICKS for Battery Saver.
- set HAPTIC_FEEDBACK_MODE_ON_ENDS for Reduce Bright Colors.
- set HAPTIC_FEEDBACK_MODE_ON_ENDS for Night Light.

Bug: 172900709
Test: manual
Change-Id: I070a0f2e4cf690bf611f62c7a4a2bcef17e08571
---
 .../ReduceBrightColorsIntensityPreferenceController.java        | 1 +
 .../display/NightDisplayIntensityPreferenceController.java      | 1 +
 .../batterysaver/BatterySaverScheduleSeekBarController.java     | 1 +
 .../settings/gestures/GestureNavigationSettingsFragment.java    | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
index b9a6d399529..09243e59bb0 100644
--- a/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
@@ -45,6 +45,7 @@ public class ReduceBrightColorsIntensityPreferenceController extends SliderPrefe
         preference.setContinuousUpdates(true);
         preference.setMax(getMax());
         preference.setMin(getMin());
+        preference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
         updateState(preference);
     }
 
diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index 02dde406eec..0f8ecc515e1 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -62,6 +62,7 @@ public class NightDisplayIntensityPreferenceController extends SliderPreferenceC
         preference.setContinuousUpdates(true);
         preference.setMax(getMax());
         preference.setMin(getMin());
+        preference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
index 5442e7d02c8..fc9de07560f 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
@@ -60,6 +60,7 @@ public class BatterySaverScheduleSeekBarController implements
         mSeekBarPreference.setMax(MAX_SEEKBAR_VALUE);
         mSeekBarPreference.setMin(MIN_SEEKBAR_VALUE);
         mSeekBarPreference.setKey(KEY_BATTERY_SAVER_SEEK_BAR);
+        mSeekBarPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);
         updateSeekBar();
     }
 
diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
index 95f4daa4c67..546581bd128 100644
--- a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
+++ b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
@@ -28,6 +28,7 @@ import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.LabeledSeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settingslib.search.SearchIndexable;
 
 /**
@@ -115,6 +116,7 @@ public class GestureNavigationSettingsFragment extends DashboardFragment {
     private void initSeekBarPreference(final String key) {
         final LabeledSeekBarPreference pref = getPreferenceScreen().findPreference(key);
         pref.setContinuousUpdates(true);
+        pref.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);
 
         final String settingsKey = key == LEFT_EDGE_SEEKBAR_KEY
                 ? Settings.Secure.BACK_GESTURE_INSET_SCALE_LEFT