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

Commit 1c2060f6 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Use the briefcase icon with the circle" into pi-dev am: a8c840c4 

am: d4811ccd

Change-Id: I646ee75594c9e0b0ab154d0905a7e050c112b9fd
parents e724ff4e d4811ccd

services/core/java/com/android/server/wm/AppTransition.java

+1 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ public class AppTransition implements Dump { 
                (height - thumbnailSize) / 2,

                (width + thumbnailSize) / 2,

                (height + thumbnailSize) / 2);

        drawable.setTint(mContext.getColor(android.R.color.white));

        drawable.draw(canvas);

        picture.endRecording();

services/core/java/com/android/server/wm/AppWindowToken.java

+1 −1
Original line number Diff line number Diff line
@@ -1984,7 +1984,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        final Rect frame = win.mFrame;

        final int thumbnailDrawableRes = getTask().mUserId == mService.mCurrentUserId

                ? R.drawable.ic_account_circle

                : R.drawable.ic_corp_badge_no_background;

                : R.drawable.ic_corp_badge;

        final GraphicBuffer thumbnail =

                mService.mAppTransition

                        .createCrossProfileAppsThumbnail(thumbnailDrawableRes, frame);