Merge "Make notes shortcut visible only after both selection and stylus usage." into main (81635eed) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/notetask/quickaffordance/NoteTaskQuickAffordanceConfig.kt

+3 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.os.UserManager
		import android.util.Log
		import com.android.keyguard.KeyguardUpdateMonitor
		import com.android.keyguard.KeyguardUpdateMonitorCallback
		import com.android.systemui.res.R
		import com.android.systemui.animation.Expandable
		import com.android.systemui.common.shared.model.ContentDescription
		import com.android.systemui.common.shared.model.Icon
		@@ -43,6 +42,7 @@ import com.android.systemui.notetask.NoteTaskController
		import com.android.systemui.notetask.NoteTaskEnabledKey
		import com.android.systemui.notetask.NoteTaskEntryPoint.QUICK_AFFORDANCE
		import com.android.systemui.notetask.NoteTaskInfoResolver
		import com.android.systemui.res.R
		import com.android.systemui.stylus.StylusManager
		import dagger.Lazy
		import java.util.concurrent.Executor
		@@ -100,7 +100,8 @@ constructor(
		isEnabled &&
		isUserUnlocked &&
		isDefaultNotesAppSet &&
		(isConfigSelected \|\| isStylusEverUsed)
		isConfigSelected &&
		isStylusEverUsed
		) {
		val contentDescription = ContentDescription.Resource(pickerNameResourceId)
		val icon = Icon.Resource(pickerIconResourceId, contentDescription)

packages/SystemUI/tests/src/com/android/systemui/notetask/quickaffordance/NoteTaskQuickAffordanceConfigTest.kt

+7 −10

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.os.UserManager
		import android.test.suitebuilder.annotation.SmallTest
		import android.testing.AndroidTestingRunner
		import com.android.dx.mockito.inline.extended.ExtendedMockito
		import com.android.systemui.res.R
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.common.shared.model.ContentDescription
		import com.android.systemui.common.shared.model.Icon
		@@ -40,6 +39,7 @@ import com.android.systemui.notetask.LaunchNotesRoleSettingsTrampolineActivity.C
		import com.android.systemui.notetask.NoteTaskController
		import com.android.systemui.notetask.NoteTaskEntryPoint
		import com.android.systemui.notetask.NoteTaskInfoResolver
		import com.android.systemui.res.R
		import com.android.systemui.stylus.StylusManager
		import com.android.systemui.util.concurrency.FakeExecutor
		import com.android.systemui.util.mockito.any
		@@ -134,12 +134,9 @@ internal class NoteTaskQuickAffordanceConfigTest : SysuiTestCase() {
		// region lockScreenState
		@Test
		fun lockScreenState_stylusUsed_userUnlocked_isSelected_shouldEmitVisible() = runTest {
		TestConfig()
		.setStylusEverUsed(true)
		.setUserUnlocked(true)
		.setConfigSelections(mock<NoteTaskQuickAffordanceConfig>())

		val underTest = createUnderTest()
		TestConfig().setStylusEverUsed(true).setUserUnlocked(true).setConfigSelections(underTest)

		val actual by collectLastValue(underTest.lockScreenState)

		assertThat(actual).isEqualTo(createLockScreenStateVisible())
		@@ -193,13 +190,13 @@ internal class NoteTaskQuickAffordanceConfigTest : SysuiTestCase() {
		}

		@Test
		fun lockScreenState_stylusUsed_userUnlocked_noSelected_shouldEmitVisible() = runTest {
		fun lockScreenState_stylusUsed_userUnlocked_noSelected_shouldEmitHidden() = runTest {
		TestConfig().setStylusEverUsed(true).setUserUnlocked(true).setConfigSelections()

		val underTest = createUnderTest()
		val actual by collectLastValue(underTest.lockScreenState)

		assertThat(actual).isEqualTo(createLockScreenStateVisible())
		assertThat(actual).isEqualTo(LockScreenState.Hidden)
		}

		@Test
		@@ -223,13 +220,13 @@ internal class NoteTaskQuickAffordanceConfigTest : SysuiTestCase() {
		}

		@Test
		fun lockScreenState_stylusUsed_userUnlocked_customSelections_shouldEmitVisible() = runTest {
		fun lockScreenState_stylusUsed_userUnlocked_customSelections_shouldEmitHidden() = runTest {
		TestConfig().setStylusEverUsed(true).setUserUnlocked(true).setConfigSelections(mock())

		val underTest = createUnderTest()
		val actual by collectLastValue(underTest.lockScreenState)

		assertThat(actual).isEqualTo(createLockScreenStateVisible())
		assertThat(actual).isEqualTo(LockScreenState.Hidden)
		}

		@Test