Merge "Updating StatusBar people avatar sources" into rvc-dev am: e62f9e767b am: dff1ac98e5 (8a60d37d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconManager.kt

+8 −15

Original line number	Diff line number	Diff line
		@@ -255,23 +255,11 @@ class IconManager @Inject constructor(

		@Throws(InflationException::class)
		private fun createPeopleAvatar(entry: NotificationEntry): Icon? {
		// Attempt to extract form shortcut.
		val conversationId = entry.ranking.channel.conversationId
		val query = LauncherApps.ShortcutQuery()
		.setPackage(entry.sbn.packageName)
		.setQueryFlags(
		LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC
		or LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED)
		.setShortcutIds(listOf(conversationId))
		val shortcuts = launcherApps.getShortcuts(query, entry.sbn.user)
		var ic: Icon? = null
		if (shortcuts != null && shortcuts.isNotEmpty()) {
		ic = shortcuts[0].icon
		}

		// Fall back to notification large icon if available
		if (ic == null) {
		ic = entry.sbn.notification.getLargeIcon()
		val shortcut = entry.ranking.shortcutInfo
		if (shortcut != null) {
		ic = launcherApps.getShortcutIcon(shortcut)
		}

		// Fall back to extract from message
		@@ -290,6 +278,11 @@ class IconManager @Inject constructor(
		}
		}

		// Fall back to notification large icon if available
		if (ic == null) {
		ic = entry.sbn.notification.getLargeIcon()
		}

		// Revert to small icon if still not available
		if (ic == null) {
		ic = entry.sbn.notification.smallIcon

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/icon/IconManagerTest.kt

0 → 100644

+209 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2020 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.statusbar.notification.icon;

		import android.app.ActivityManager;
		import android.app.Notification;
		import android.app.NotificationChannel
		import android.app.NotificationManager.IMPORTANCE_DEFAULT
		import android.app.Person
		import android.content.pm.LauncherApps
		import android.content.pm.ShortcutInfo
		import android.graphics.drawable.Drawable
		import android.graphics.drawable.Icon
		import android.os.SystemClock
		import android.os.UserHandle
		import android.testing.AndroidTestingRunner;
		import androidx.test.InstrumentationRegistry
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.controls.controller.AuxiliaryPersistenceWrapperTest.Companion.any
		import com.android.systemui.statusbar.notification.collection.NotificationEntry
		import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder
		import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection
		import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
		import org.junit.Assert.assertEquals
		import org.junit.Before
		import org.junit.Test

		import org.junit.runner.RunWith;
		import org.mockito.Mock
		import org.mockito.Mockito.`when`
		import org.mockito.Mockito.anyInt
		import org.mockito.MockitoAnnotations

		@SmallTest
		@RunWith(AndroidTestingRunner::class)
		class IconManagerTest: SysuiTestCase() {
		companion object {
		private const val TEST_PACKAGE_NAME = "test";
		private const val TEST_UID = 0;
		}


		private var id = 0
		private val context = InstrumentationRegistry.getTargetContext();
		@Mock private lateinit var shortcut: ShortcutInfo
		@Mock private lateinit var shortcutIc: Icon
		@Mock private lateinit var messageIc: Icon
		@Mock private lateinit var largeIc: Icon
		@Mock private lateinit var smallIc: Icon
		@Mock private lateinit var drawable: Drawable
		@Mock private lateinit var row: ExpandableNotificationRow

		@Mock private lateinit var notifCollection: CommonNotifCollection
		@Mock private lateinit var launcherApps: LauncherApps

		private val iconBuilder = IconBuilder(context)

		private lateinit var iconManager: IconManager

		@Before
		fun setUp() {
		MockitoAnnotations.initMocks(this)

		`when`(shortcutIc.loadDrawableAsUser(any(), anyInt())).thenReturn(drawable)
		`when`(messageIc.loadDrawableAsUser(any(), anyInt())).thenReturn(drawable)
		`when`(largeIc.loadDrawableAsUser(any(), anyInt())).thenReturn(drawable)
		`when`(smallIc.loadDrawableAsUser(any(), anyInt())).thenReturn(drawable)

		`when`(shortcut.icon).thenReturn(shortcutIc)
		`when`(launcherApps.getShortcutIcon(shortcut)).thenReturn(shortcutIc)

		iconManager = IconManager(notifCollection, launcherApps, iconBuilder)
		}

		@Test
		fun testCreateIcons_importantConversation_shortcutIcon() {
		val entry = notificationEntry(true, true, true)
		entry?.channel?.isImportantConversation = true
		entry?.let {
		iconManager.createIcons(it)
		}
		assertEquals(entry?.icons?.statusBarIcon?.sourceIcon, shortcutIc)
		}

		@Test
		fun testCreateIcons_importantConversation_messageIcon() {
		val entry = notificationEntry(false, true, true)
		entry?.channel?.isImportantConversation = true
		entry?.let {
		iconManager.createIcons(it)
		}
		assertEquals(entry?.icons?.statusBarIcon?.sourceIcon, messageIc)
		}

		@Test
		fun testCreateIcons_importantConversation_largeIcon() {
		val entry = notificationEntry(false, false, true)
		entry?.channel?.isImportantConversation = true
		entry?.let {
		iconManager.createIcons(it)
		}
		assertEquals(entry?.icons?.statusBarIcon?.sourceIcon, largeIc)
		}

		@Test
		fun testCreateIcons_importantConversation_smallIcon() {
		val entry = notificationEntry(false, false, false)
		entry?.channel?.isImportantConversation = true
		entry?.let {
		iconManager.createIcons(it)
		}
		assertEquals(entry?.icons?.statusBarIcon?.sourceIcon, smallIc)
		}

		@Test
		fun testCreateIcons_notImportantConversation() {
		val entry = notificationEntry(true, true, true)
		entry?.let {
		iconManager.createIcons(it)
		}
		assertEquals(entry?.icons?.statusBarIcon?.sourceIcon, smallIc)
		}

		@Test
		fun testCreateIcons_sensitiveImportantConversation() {
		val entry = notificationEntry(true, false, false)
		entry?.setSensitive(true, true);
		entry?.channel?.isImportantConversation = true
		entry?.let {
		iconManager.createIcons(it)
		}
		assertEquals(entry?.icons?.statusBarIcon?.sourceIcon, shortcutIc)
		assertEquals(entry?.icons?.shelfIcon?.sourceIcon, smallIc)
		assertEquals(entry?.icons?.aodIcon?.sourceIcon, smallIc)
		}

		@Test
		fun testUpdateIcons_sensitivityChange() {
		val entry = notificationEntry(true, false, false)
		entry?.channel?.isImportantConversation = true
		entry?.setSensitive(true, true);
		entry?.let {
		iconManager.createIcons(it)
		}
		assertEquals(entry?.icons?.aodIcon?.sourceIcon, smallIc)
		entry?.setSensitive(false, false);
		entry?.let {
		iconManager.updateIcons(it)
		}
		assertEquals(entry?.icons?.shelfIcon?.sourceIcon, shortcutIc)
		}

		private fun notificationEntry(
		hasShortcut: Boolean,
		hasMessage: Boolean,
		hasLargeIcon: Boolean
		): NotificationEntry? {
		val n = Notification.Builder(mContext, "id")
		.setSmallIcon(smallIc)
		.setContentTitle("Title")
		.setContentText("Text")

		if (hasMessage) {
		n.style = Notification.MessagingStyle("")
		.addMessage(Notification.MessagingStyle.Message(
		"",
		SystemClock.currentThreadTimeMillis(),
		Person.Builder().setIcon(messageIc).build()
		))
		}

		if (hasLargeIcon) {
		n.setLargeIcon(largeIc)
		}

		val builder = NotificationEntryBuilder()
		.setPkg(TEST_PACKAGE_NAME)
		.setOpPkg(TEST_PACKAGE_NAME)
		.setUid(TEST_UID)
		.setId(id++)
		.setNotification(n.build())
		.setChannel(NotificationChannel("id", "", IMPORTANCE_DEFAULT))
		.setUser(UserHandle(ActivityManager.getCurrentUser()))

		if (hasShortcut) {
		builder.setShortcutInfo(shortcut)
		}

		val entry = builder.build()
		entry.row = row
		entry.setSensitive(false, true);
		return entry
		}
		}