Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply theme shape clipping to group convo avatars

Browse Source 
Fixes: 158493588
Test: manual
Change-Id: I57b5e0712822b345c9dcce74b8a6d6ff33409de6
This commit is contained in:
Steve Elliott
2020-06-10 11:35:01 -04:00
parent 275248ddfe
commit 86bc69a491
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/app/Notification.java
View File

@@ -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);
}
/**

32
core/java/android/content/pm/LauncherApps.java
View File

@@ -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 {