Merge "Reverting changes from ag/24270073 to go back to previous Chipbar haptics." into main (504e29b9) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt

+9 −16

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import androidx.annotation.VisibleForTesting
		import com.android.app.animation.Interpolators
		import com.android.internal.widget.CachingIconView
		import com.android.systemui.Gefingerpoken
		import com.android.systemui.res.R
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.common.shared.model.ContentDescription.Companion.loadContentDescription
		import com.android.systemui.common.shared.model.Text.Companion.loadText
		@@ -48,9 +47,8 @@ import com.android.systemui.common.ui.binder.TintedIconViewBinder
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.VibratorHelper
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.temporarydisplay.TemporaryViewDisplayController
		@@ -96,7 +94,6 @@ constructor(
		wakeLockBuilder: WakeLock.Builder,
		systemClock: SystemClock,
		tempViewUiEventLogger: TemporaryViewUiEventLogger,
		private val featureFlags: FeatureFlags,
		) :
		TemporaryViewDisplayController<ChipbarInfo, ChipbarLogger>(
		context,
		@@ -234,9 +231,6 @@ constructor(
		maybeGetAccessibilityFocus(newInfo, currentView)

		// ---- Haptics ----
		if (featureFlags.isEnabled(ONE_WAY_HAPTICS_API_MIGRATION)) {
		vibratorHelper.performHapticFeedback(parent, newInfo.vibrationConstant)
		} else {
		newInfo.vibrationEffect?.let {
		vibratorHelper.vibrate(
		Process.myUid(),
		@@ -247,7 +241,6 @@ constructor(
		)
		}
		}
		}

		private fun maybeGetAccessibilityFocus(info: ChipbarInfo?, view: ViewGroup) {
		// Don't steal focus unless the chipbar has something interactable.

packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarInfo.kt

+1 −3

Original line number	Diff line number	Diff line
		@@ -17,13 +17,12 @@
		package com.android.systemui.temporarydisplay.chipbar

		import android.os.VibrationEffect
		import android.view.HapticFeedbackConstants
		import android.view.View
		import androidx.annotation.AttrRes
		import com.android.internal.logging.InstanceId
		import com.android.systemui.res.R
		import com.android.systemui.common.shared.model.Text
		import com.android.systemui.common.shared.model.TintedIcon
		import com.android.systemui.res.R
		import com.android.systemui.temporarydisplay.TemporaryViewInfo
		import com.android.systemui.temporarydisplay.ViewPriority

		@@ -43,7 +42,6 @@ data class ChipbarInfo(
		val text: Text,
		val endItem: ChipbarEndItem?,
		val vibrationEffect: VibrationEffect? = null,
		val vibrationConstant: Int = HapticFeedbackConstants.NO_HAPTICS,
		val allowSwipeToDismiss: Boolean = false,
		override val windowTitle: String,
		override val wakeReason: String,

packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt

+1 −6

Original line number	Diff line number	Diff line
		@@ -35,15 +35,13 @@ import android.widget.TextView
		import androidx.test.filters.SmallTest
		import com.android.internal.logging.testing.UiEventLoggerFake
		import com.android.internal.statusbar.IUndoMediaTransferCallback
		import com.android.systemui.res.R
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.common.shared.model.Text.Companion.loadText
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION
		import com.android.systemui.media.taptotransfer.MediaTttFlags
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.statusbar.VibratorHelper
		import com.android.systemui.statusbar.policy.ConfigurationController
		@@ -113,7 +111,6 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() {
		private lateinit var uiEventLogger: MediaTttSenderUiEventLogger
		private lateinit var tempViewUiEventLogger: TemporaryViewUiEventLogger
		private val defaultTimeout = context.resources.getInteger(R.integer.heads_up_notification_decay)
		private val featureFlags = FakeFeatureFlags()

		@Before
		fun setUp() {
		@@ -163,9 +160,7 @@ class MediaTttSenderCoordinatorTest : SysuiTestCase() {
		fakeWakeLockBuilder,
		fakeClock,
		tempViewUiEventLogger,
		featureFlags
		)
		featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false)
		chipbarCoordinator.start()

		underTest =

packages/SystemUI/tests/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt

+1 −26

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.os.VibrationAttributes
		import android.os.VibrationEffect
		import android.testing.AndroidTestingRunner
		import android.testing.TestableLooper
		import android.view.HapticFeedbackConstants
		import android.view.MotionEvent
		import android.view.View
		import android.view.ViewGroup
		@@ -33,7 +32,6 @@ import androidx.core.animation.doOnCancel
		import androidx.test.filters.SmallTest
		import com.android.internal.logging.InstanceId
		import com.android.internal.logging.testing.UiEventLoggerFake
		import com.android.systemui.res.R
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.classifier.FalsingCollector
		import com.android.systemui.common.shared.model.ContentDescription
		@@ -42,9 +40,8 @@ import com.android.systemui.common.shared.model.Icon
		import com.android.systemui.common.shared.model.Text
		import com.android.systemui.common.shared.model.TintedIcon
		import com.android.systemui.dump.DumpManager
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags.ONE_WAY_HAPTICS_API_MIGRATION
		import com.android.systemui.plugins.FalsingManager
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.VibratorHelper
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.temporarydisplay.TemporaryViewUiEvent
		@@ -94,7 +91,6 @@ class ChipbarCoordinatorTest : SysuiTestCase() {
		private lateinit var fakeExecutor: FakeExecutor
		private lateinit var uiEventLoggerFake: UiEventLoggerFake
		private lateinit var uiEventLogger: TemporaryViewUiEventLogger
		private val featureFlags = FakeFeatureFlags()

		@Before
		fun setUp() {
		@@ -131,10 +127,8 @@ class ChipbarCoordinatorTest : SysuiTestCase() {
		fakeWakeLockBuilder,
		fakeClock,
		uiEventLogger,
		featureFlags
		)
		underTest.start()
		featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, false)
		}

		@Test
		@@ -494,23 +488,6 @@ class ChipbarCoordinatorTest : SysuiTestCase() {
		)
		}

		@Test
		fun displayView_oneWayHapticsEnabled_usesPerformHapticFeedback() {
		featureFlags.set(ONE_WAY_HAPTICS_API_MIGRATION, true)
		val constant: Int = HapticFeedbackConstants.CONFIRM
		underTest.displayView(
		createChipbarInfo(
		Icon.Resource(R.id.check_box, null),
		Text.Loaded("text"),
		endItem = null,
		vibrationEffect = null,
		vibrationConstant = constant
		)
		)

		verify(vibratorHelper).performHapticFeedback(any(), eq(constant))
		}

		/** Regression test for b/266119467. */
		@Test
		fun displayView_animationFailure_viewsStillBecomeVisible() {
		@@ -729,14 +706,12 @@ class ChipbarCoordinatorTest : SysuiTestCase() {
		endItem: ChipbarEndItem?,
		vibrationEffect: VibrationEffect? = null,
		allowSwipeToDismiss: Boolean = false,
		vibrationConstant: Int = HapticFeedbackConstants.NO_HAPTICS,
		): ChipbarInfo {
		return ChipbarInfo(
		TintedIcon(startIcon, tint = null),
		text,
		endItem,
		vibrationEffect,
		vibrationConstant,
		allowSwipeToDismiss,
		windowTitle = WINDOW_TITLE,
		wakeReason = WAKE_REASON,