Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f36b6181 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Apply theme shape clipping to group convo avatars" into rvc-dev am: 0561690c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11820082

Change-Id: I591adad5d93ade0199eab56787be49e1ff860ea5
parents 6adc35b1 0561690c

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);

        }



        /**

core/java/android/content/pm/LauncherApps.java

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

core/java/com/android/internal/widget/ConversationLayout.java

+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;

    }



    /**