BrightnessSlider: Extend haptics for auto brightness button (ad871c19) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt

+12 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.content.ContentResolver
		import android.content.Context
		import android.database.ContentObserver
		import android.os.UserHandle
		import android.view.HapticFeedbackConstants
		import android.view.MotionEvent
		import androidx.annotation.VisibleForTesting
		import androidx.compose.animation.animateColorAsState
		@@ -82,6 +83,7 @@ import androidx.compose.ui.graphics.painter.ColorPainter
		import androidx.compose.ui.graphics.painter.Painter
		import androidx.compose.ui.input.pointer.pointerInteropFilter
		import androidx.compose.ui.platform.LocalContext
		import androidx.compose.ui.platform.LocalView
		import androidx.compose.ui.res.colorResource
		import androidx.compose.ui.res.painterResource
		import androidx.compose.ui.res.stringResource
		@@ -416,6 +418,7 @@ private fun drawAutoBrightnessButton(
		autoMode: Boolean,
		onIconClick: suspend () -> Unit,
		) {
		val view = LocalView.current
		val coroutineScope = rememberCoroutineScope()
		val backgroundColor by animateColorAsState(
		targetValue = if (autoMode) {
		@@ -436,9 +439,17 @@ private fun drawAutoBrightnessButton(
		} else {
		R.drawable.ic_qs_brightness_auto_off
		}
		val hapticConstant = if (autoMode) {
		HapticFeedbackConstants.TOGGLE_OFF
		} else {
		HapticFeedbackConstants.TOGGLE_ON
		}

		IconButton(
		onClick = { coroutineScope.launch { onIconClick() } },
		onClick = {
		view.performHapticFeedback(hapticConstant)
		coroutineScope.launch { onIconClick() }
		},
		modifier = Modifier
		.size(52.dp)
		.clip(CircleShape)