commit | a8c840c46d63ee5d5c837de8b0b3b41e00f0ecb8 | [log] [tgz] |
---|---|---|
author | android-build-team Robot <android-build-team-robot@google.com> | Fri Apr 27 13:00:59 2018 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 27 13:00:59 2018 +0000 |
tree | 9cefd0705f89d25992408dd33d496e0116cd4bb2 | |
parent | 8ba6a53270d81f86c7264a3b89385a3d0b9341ab [diff] | |
parent | da4af2379576f824bb6b439041222147cc17979b [diff] |
Merge "Use the briefcase icon with the circle" into pi-dev
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index c761754..2f174c2 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -984,6 +984,7 @@ (height - thumbnailSize) / 2, (width + thumbnailSize) / 2, (height + thumbnailSize) / 2); + drawable.setTint(mContext.getColor(android.R.color.white)); drawable.draw(canvas); picture.endRecording();
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index a701d42..a9560e6 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -1984,7 +1984,7 @@ 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);