Merge "Apply theme shape clipping to group convo avatars" into rvc-dev (0561690c) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -7495,6 +7495,7 @@ public class Notification implements Parcelable
		mHistoricMessages = Message.getMessagesFromBundleArray(histMessages);
		mIsGroupConversation = extras.getBoolean(EXTRA_IS_GROUP_CONVERSATION);
		mUnreadMessageCount = extras.getInt(EXTRA_CONVERSATION_UNREAD_MESSAGE_COUNT);
		mShortcutIcon = extras.getParcelable(EXTRA_CONVERSATION_ICON);
		}

		/**

+24 −8

Original line number	Diff line number	Diff line
		@@ -1243,14 +1243,7 @@ public class LauncherApps {

		private ParcelFileDescriptor getUriShortcutIconFd(@NonNull String packageName,
		@NonNull String shortcutId, int userId) {
		String uri = null;
		try {
		uri = mService.getShortcutIconUri(mContext.getPackageName(), packageName, shortcutId,
		userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

		String uri = getShortcutIconUri(packageName, shortcutId, userId);
		if (uri == null) {
		return null;
		}
		@@ -1262,6 +1255,18 @@ public class LauncherApps {
		}
		}

		private String getShortcutIconUri(@NonNull String packageName,
		@NonNull String shortcutId, int userId) {
		String uri = null;
		try {
		uri = mService.getShortcutIconUri(mContext.getPackageName(), packageName, shortcutId,
		userId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		return uri;
		}

		/**
		* Returns the icon for this shortcut, without any badging for the profile.
		*
		@@ -1357,6 +1362,17 @@ public class LauncherApps {
		} catch (IOException ignore) {
		}
		}
		} else if (shortcut.hasIconUri()) {
		String uri = getShortcutIconUri(shortcut.getPackage(), shortcut.getId(),
		shortcut.getUserId());
		if (uri == null) {
		return null;
		}
		if (shortcut.hasAdaptiveBitmap()) {
		return Icon.createWithAdaptiveBitmapContentUri(uri);
		} else {
		return Icon.createWithContentUri(uri);
		}
		} else if (shortcut.hasIconResource()) {
		return Icon.createWithResource(shortcut.getPackage(), shortcut.getIconResourceId());
		} else {

+2 −2

Original line number	Diff line number	Diff line
		@@ -785,8 +785,8 @@ public class ConversationLayout extends FrameLayout
		}

		@RemotableViewMethod
		public void setShortcutIcon(Icon conversationIcon) {
		mConversationIcon = conversationIcon;
		public void setShortcutIcon(Icon shortcutIcon) {
		mShortcutIcon = shortcutIcon;
		}

		/**