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

Commit 54bc942f authored by Matthew Ng's avatar Matthew Ng
Browse files

Updated TaskDescription to pass drawable resource ID (1/2) 

Depreciated the TaskDescription constructor when passing a bitmap and
added constructors to support passing drawable resource ID. Passing
drawable IDs allow users to use drawables such as AdaptiveIcons
instead of creating and passing a bitmap. Later SystemUI checks for
either bitmap, file name or resource ID to get a drawable to display.

Test: run-test CtsActivityManagerDeviceTestCases android.server.am
.TaskDescriptionTest
Change-Id: Ib944687249acf9fb6bbf9a9a109930cc04539e14
Fixes: 36298959
parent 959516a8

api/current.txt

+4 −2
Original line number Diff line number Diff line
@@ -4006,8 +4006,10 @@ package android.app { 
  }















  public static class ActivityManager.TaskDescription implements android.os.Parcelable {













    ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);













    ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);













    ctor public deprecated ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);













    ctor public ActivityManager.TaskDescription(java.lang.String, int, int);













    ctor public deprecated ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);













    ctor public ActivityManager.TaskDescription(java.lang.String, int);















    ctor public ActivityManager.TaskDescription(java.lang.String);















    ctor public ActivityManager.TaskDescription();















    ctor public ActivityManager.TaskDescription(android.app.ActivityManager.TaskDescription);

























api/system-current.txt



+4
−2




























Original line number
Diff line number
Diff line








@@ -4168,8 +4168,10 @@ package android.app {













  }





























  public static class ActivityManager.TaskDescription implements android.os.Parcelable {













    ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);













    ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);













    ctor public deprecated ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);













    ctor public ActivityManager.TaskDescription(java.lang.String, int, int);













    ctor public deprecated ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);













    ctor public ActivityManager.TaskDescription(java.lang.String, int);















    ctor public ActivityManager.TaskDescription(java.lang.String);















    ctor public ActivityManager.TaskDescription();















    ctor public ActivityManager.TaskDescription(android.app.ActivityManager.TaskDescription);

























api/test-current.txt



+6
−2




























Original line number
Diff line number
Diff line








@@ -4026,13 +4026,17 @@ package android.app {













  }





























  public static class ActivityManager.TaskDescription implements android.os.Parcelable {













    ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);













    ctor public ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);













    ctor public deprecated ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap, int);













    ctor public ActivityManager.TaskDescription(java.lang.String, int, int);













    ctor public deprecated ActivityManager.TaskDescription(java.lang.String, android.graphics.Bitmap);













    ctor public ActivityManager.TaskDescription(java.lang.String, int);















    ctor public ActivityManager.TaskDescription(java.lang.String);















    ctor public ActivityManager.TaskDescription();















    ctor public ActivityManager.TaskDescription(android.app.ActivityManager.TaskDescription);















    method public int describeContents();















    method public android.graphics.Bitmap getIcon();













    method public java.lang.String getIconFilename();













    method public int getIconResource();















    method public java.lang.String getLabel();















    method public int getPrimaryColor();















    method public void readFromParcel(android.os.Parcel);

























core/java/android/app/ActivityManager.java



+72
−12




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.app;































import android.Manifest;













import android.annotation.DrawableRes;















import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;










@@ -941,11 +942,14 @@ public class ActivityManager {













                ATTR_TASKDESCRIPTION_PREFIX + "color";















        private static final String ATTR_TASKDESCRIPTIONCOLOR_BACKGROUND =















                ATTR_TASKDESCRIPTION_PREFIX + "colorBackground";













        private static final String ATTR_TASKDESCRIPTIONICONFILENAME =













        private static final String ATTR_TASKDESCRIPTIONICON_FILENAME =















                ATTR_TASKDESCRIPTION_PREFIX + "icon_filename";













        private static final String ATTR_TASKDESCRIPTIONICON_RESOURCE =













                ATTR_TASKDESCRIPTION_PREFIX + "icon_resource";































        private String mLabel;















        private Bitmap mIcon;













        private int mIconRes;















        private String mIconFilename;















        private int mColorPrimary;















        private int mColorBackground;









@@ -959,9 +963,27 @@ public class ActivityManager {













         * @param icon An icon that represents the current state of this task.















         * @param colorPrimary A color to override the theme's primary color.  This color must be















         *                     opaque.













         * @deprecated use TaskDescription constructor with icon resource instead















         */













        @Deprecated















        public TaskDescription(String label, Bitmap icon, int colorPrimary) {













            this(label, icon, null, colorPrimary, 0, 0, 0);













            this(label, icon, 0, null, colorPrimary, 0, 0, 0);













            if ((colorPrimary != 0) && (Color.alpha(colorPrimary) != 255)) {













                throw new RuntimeException("A TaskDescription's primary color should be opaque");













            }













        }



























        /**













         * Creates the TaskDescription to the specified values.













         *













         * @param label A label and description of the current state of this task.













         * @param iconRes A drawable resource of an icon that represents the current state of this













         *                activity.













         * @param colorPrimary A color to override the theme's primary color.  This color must be













         *                     opaque.













         */













        public TaskDescription(String label, @DrawableRes int iconRes, int colorPrimary) {













            this(label, null, iconRes, null, colorPrimary, 0, 0, 0);















            if ((colorPrimary != 0) && (Color.alpha(colorPrimary) != 255)) {















                throw new RuntimeException("A TaskDescription's primary color should be opaque");















            }









@@ -972,9 +994,22 @@ public class ActivityManager {













         *















         * @param label A label and description of the current state of this activity.















         * @param icon An icon that represents the current state of this activity.













         * @deprecated use TaskDescription constructor with icon resource instead















         */













        @Deprecated















        public TaskDescription(String label, Bitmap icon) {













            this(label, icon, null, 0, 0, 0, 0);













            this(label, icon, 0, null, 0, 0, 0, 0);













        }



























        /**













         * Creates the TaskDescription to the specified values.













         *













         * @param label A label and description of the current state of this activity.













         * @param iconRes A drawable resource of an icon that represents the current state of this













         *                activity.













         */













        public TaskDescription(String label, @DrawableRes int iconRes) {













            this(label, null, iconRes, null, 0, 0, 0, 0);















        }































        /**









@@ -983,21 +1018,22 @@ public class ActivityManager {













         * @param label A label and description of the current state of this activity.















         */















        public TaskDescription(String label) {













            this(label, null, null, 0, 0, 0, 0);













            this(label, null, 0, null, 0, 0, 0, 0);















        }































        /**















         * Creates an empty TaskDescription.















         */















        public TaskDescription() {













            this(null, null, null, 0, 0, 0, 0);













            this(null, null, 0, null, 0, 0, 0, 0);















        }































        /** @hide */













        public TaskDescription(String label, Bitmap icon, String iconFilename, int colorPrimary,













                int colorBackground, int statusBarColor, int navigationBarColor) {













        public TaskDescription(String label, Bitmap bitmap, int iconRes, String iconFilename,













                int colorPrimary, int colorBackground, int statusBarColor, int navigationBarColor) {















            mLabel = label;













            mIcon = icon;













            mIcon = bitmap;













            mIconRes = iconRes;















            mIconFilename = iconFilename;















            mColorPrimary = colorPrimary;















            mColorBackground = colorBackground;









@@ -1019,6 +1055,7 @@ public class ActivityManager {













        public void copyFrom(TaskDescription other) {















            mLabel = other.mLabel;















            mIcon = other.mIcon;













            mIconRes = other.mIconRes;















            mIconFilename = other.mIconFilename;















            mColorPrimary = other.mColorPrimary;















            mColorBackground = other.mColorBackground;









@@ -1034,6 +1071,7 @@ public class ActivityManager {













        public void copyFromPreserveHiddenFields(TaskDescription other) {















            mLabel = other.mLabel;















            mIcon = other.mIcon;













            mIconRes = other.mIconRes;















            mIconFilename = other.mIconFilename;















            mColorPrimary = other.mColorPrimary;















            if (other.mColorBackground != 0) {










@@ -1105,6 +1143,14 @@ public class ActivityManager {













            mIcon = icon;















        }





























        /**













         * Sets the icon resource for this task description.













         * @hide













         */













        public void setIcon(int iconRes) {













            mIconRes = iconRes;













        }





























        /**















         * Moves the icon bitmap reference from an actual Bitmap to a file containing the















         * bitmap.










@@ -1133,6 +1179,13 @@ public class ActivityManager {













        }































        /** @hide */













        @TestApi













        public int getIconResource() {













            return mIconRes;













        }



























        /** @hide */













        @TestApi















        public String getIconFilename() {















            return mIconFilename;















        }










@@ -1198,7 +1251,10 @@ public class ActivityManager {













                        Integer.toHexString(mColorBackground));















            }















            if (mIconFilename != null) {













                out.attribute(null, ATTR_TASKDESCRIPTIONICONFILENAME, mIconFilename);













                out.attribute(null, ATTR_TASKDESCRIPTIONICON_FILENAME, mIconFilename);













            }













            if (mIconRes != 0) {













                out.attribute(null, ATTR_TASKDESCRIPTIONICON_RESOURCE, Integer.toString(mIconRes));















            }















        }

























@@ -1210,8 +1266,10 @@ public class ActivityManager {













                setPrimaryColor((int) Long.parseLong(attrValue, 16));















            } else if (ATTR_TASKDESCRIPTIONCOLOR_BACKGROUND.equals(attrName)) {















                setBackgroundColor((int) Long.parseLong(attrValue, 16));













            } else if (ATTR_TASKDESCRIPTIONICONFILENAME.equals(attrName)) {













            } else if (ATTR_TASKDESCRIPTIONICON_FILENAME.equals(attrName)) {















                setIconFilename(attrValue);













            } else if (ATTR_TASKDESCRIPTIONICON_RESOURCE.equals(attrName)) {













                setIcon(Integer.parseInt(attrValue, 10));















            }















        }

























@@ -1234,6 +1292,7 @@ public class ActivityManager {













                dest.writeInt(1);















                mIcon.writeToParcel(dest, 0);















            }













            dest.writeInt(mIconRes);















            dest.writeInt(mColorPrimary);















            dest.writeInt(mColorBackground);















            dest.writeInt(mStatusBarColor);









@@ -1249,6 +1308,7 @@ public class ActivityManager {













        public void readFromParcel(Parcel source) {















            mLabel = source.readInt() > 0 ? source.readString() : null;















            mIcon = source.readInt() > 0 ? Bitmap.CREATOR.createFromParcel(source) : null;













            mIconRes = source.readInt();















            mColorPrimary = source.readInt();















            mColorBackground = source.readInt();















            mStatusBarColor = source.readInt();









@@ -1269,8 +1329,8 @@ public class ActivityManager {













        @Override















        public String toString() {















            return "TaskDescription Label: " + mLabel + " Icon: " + mIcon +













                    " IconFilename: " + mIconFilename + " colorPrimary: " + mColorPrimary +













                    " colorBackground: " + mColorBackground +













                    " IconRes: " + mIconRes + " IconFilename: " + mIconFilename +













                    " colorPrimary: " + mColorPrimary + " colorBackground: " + mColorBackground +















                    " statusBarColor: " + mColorBackground +















                    " navigationBarColor: " + mNavigationBarColor;















        }

































packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java



+16
−4




























Original line number
Diff line number
Diff line








@@ -45,6 +45,7 @@ import android.content.pm.ApplicationInfo;













import android.content.pm.IPackageManager;















import android.content.pm.PackageManager;















import android.content.res.Resources;













import android.content.res.Resources.NotFoundException;















import android.graphics.Bitmap;















import android.graphics.BitmapFactory;















import android.graphics.Canvas;










@@ -234,7 +235,6 @@ public class SystemServicesProxy {













     */















    public List<ActivityManager.RecentTaskInfo> getRecentTasks(int numTasks, int userId) {















        if (mAm == null) return null;





























        try {















            List<ActivityManager.RecentTaskInfo> tasks = mIam.getRecentTasks(numTasks,















                    RECENT_IGNORE_UNAVAILABLE, userId).getList();










@@ -627,12 +627,24 @@ public class SystemServicesProxy {













    public Drawable getBadgedTaskDescriptionIcon(ActivityManager.TaskDescription taskDescription,















            int userId, Resources res) {















        Bitmap tdIcon = taskDescription.getInMemoryIcon();













        if (tdIcon == null) {













        Drawable dIcon = null;













        if (tdIcon != null) {













            dIcon = new BitmapDrawable(res, tdIcon);













        } else if (taskDescription.getIconResource() != 0) {













            try {













                dIcon = mContext.getDrawable(taskDescription.getIconResource());













            } catch (NotFoundException e) {













                Log.e(TAG, "Could not find icon drawable from resource", e);













            }













        } else {















            tdIcon = ActivityManager.TaskDescription.loadTaskDescriptionIcon(















                    taskDescription.getIconFilename(), userId);













        }















            if (tdIcon != null) {













            return getBadgedIcon(new BitmapDrawable(res, tdIcon), userId);













                dIcon = new BitmapDrawable(res, tdIcon);













            }













        }













        if (dIcon != null) {













            return getBadgedIcon(dIcon, userId);















        }















        return null;















    }