Merge "Renaming brightness slider UI logged events." into main (59e50b3a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -30,11 +30,11 @@ import androidx.annotation.Nullable;
		import com.android.internal.logging.UiEventLogger;
		import com.android.settingslib.RestrictedLockUtils;
		import com.android.systemui.Gefingerpoken;
		import com.android.systemui.res.R;
		import com.android.systemui.classifier.Classifier;
		import com.android.systemui.dagger.qualifiers.Main;
		import com.android.systemui.haptics.slider.SeekableSliderEventProducer;
		import com.android.systemui.plugins.FalsingManager;
		import com.android.systemui.res.R;
		import com.android.systemui.statusbar.VibratorHelper;
		import com.android.systemui.statusbar.policy.BrightnessMirrorController;
		import com.android.systemui.util.ViewController;
		@@ -236,7 +236,7 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV
		@Override
		public void onStartTrackingTouch(SeekBar seekBar) {
		mTracking = true;
		mUiEventLogger.log(BrightnessSliderEvent.SLIDER_STARTED_TRACKING_TOUCH);
		mUiEventLogger.log(BrightnessSliderEvent.BRIGHTNESS_SLIDER_STARTED_TRACKING_TOUCH);
		if (mListener != null) {
		mListener.onChanged(mTracking, getValue(), false);
		SeekableSliderEventProducer eventProducer =
		@@ -255,7 +255,7 @@ public class BrightnessSliderController extends ViewController<BrightnessSliderV
		@Override
		public void onStopTrackingTouch(SeekBar seekBar) {
		mTracking = false;
		mUiEventLogger.log(BrightnessSliderEvent.SLIDER_STOPPED_TRACKING_TOUCH);
		mUiEventLogger.log(BrightnessSliderEvent.BRIGHTNESS_SLIDER_STOPPED_TRACKING_TOUCH);
		if (mListener != null) {
		mListener.onChanged(mTracking, getValue(), true);
		SeekableSliderEventProducer eventProducer =

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessSliderEvent.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -21,10 +21,10 @@ import com.android.internal.logging.UiEventLogger;

		public enum BrightnessSliderEvent implements UiEventLogger.UiEventEnum {

		@UiEvent(doc = "slider started to track touch")
		SLIDER_STARTED_TRACKING_TOUCH(1472),
		@UiEvent(doc = "slider stopped tracking touch")
		SLIDER_STOPPED_TRACKING_TOUCH(1473);
		@UiEvent(doc = "brightness slider started to track touch")
		BRIGHTNESS_SLIDER_STARTED_TRACKING_TOUCH(1472),
		@UiEvent(doc = "brightness slider stopped tracking touch")
		BRIGHTNESS_SLIDER_STOPPED_TRACKING_TOUCH(1473);

		private final int mId;

packages/SystemUI/tests/src/com/android/systemui/settings/brightness/BrightnessSliderControllerTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -202,7 +202,7 @@ class BrightnessSliderControllerTest : SysuiTestCase() {
		@Test
		fun testSeekBarTrackingStarted() {
		whenever(brightnessSliderView.value).thenReturn(42)
		val event = BrightnessSliderEvent.SLIDER_STARTED_TRACKING_TOUCH
		val event = BrightnessSliderEvent.BRIGHTNESS_SLIDER_STARTED_TRACKING_TOUCH

		mController.onViewAttached()
		mController.setMirrorControllerAndMirror(mirrorController)
		@@ -220,7 +220,7 @@ class BrightnessSliderControllerTest : SysuiTestCase() {
		@Test
		fun testSeekBarTrackingStopped() {
		whenever(brightnessSliderView.value).thenReturn(23)
		val event = BrightnessSliderEvent.SLIDER_STOPPED_TRACKING_TOUCH
		val event = BrightnessSliderEvent.BRIGHTNESS_SLIDER_STOPPED_TRACKING_TOUCH

		mController.onViewAttached()
		mController.setMirrorControllerAndMirror(mirrorController)