diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-04-08 18:28:14 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-08 18:28:14 -0700 |
commit | bcbab3684349353ee8cab30b556001824d0e7ccf (patch) | |
tree | cd5699f89c052a71e8ebad1cc4fbbb256c5c0883 /core/java/android/app/ActivityManager.java | |
parent | 0741b1ae22ecb5f6ac449bf85ef06e05c8d8f438 (diff) | |
parent | f26fd99a7c2f554b0297760bb66336473c7db61f (diff) | |
download | frameworks_base-bcbab3684349353ee8cab30b556001824d0e7ccf.zip frameworks_base-bcbab3684349353ee8cab30b556001824d0e7ccf.tar.gz frameworks_base-bcbab3684349353ee8cab30b556001824d0e7ccf.tar.bz2 |
Merge "Rework thumbnails in activity manager."
Diffstat (limited to 'core/java/android/app/ActivityManager.java')
-rw-r--r-- | core/java/android/app/ActivityManager.java | 67 |
1 files changed, 65 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 45d49b1..1b4ef0d 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -38,6 +38,7 @@ import android.util.Log; import com.android.internal.app.IUsageStats; import com.android.internal.os.PkgUsageStats; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -395,9 +396,71 @@ public class ActivityManager { } /** @hide */ - public Bitmap getTaskThumbnail(int id) throws SecurityException { + public static class TaskThumbnails implements Parcelable { + public Bitmap mainThumbnail; + + public int numSubThumbbails; + + /** @hide */ + public IThumbnailRetriever retriever; + + /** @hide Magic for ActivityManagerService. Not marshalled */ + public ArrayList<Bitmap> otherThumbnails; + + public TaskThumbnails() { + } + + public Bitmap getSubThumbnail(int index) { + try { + return retriever.getThumbnail(index); + } catch (RemoteException e) { + return null; + } + } + + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel dest, int flags) { + if (mainThumbnail != null) { + dest.writeInt(1); + mainThumbnail.writeToParcel(dest, 0); + } else { + dest.writeInt(0); + } + dest.writeInt(numSubThumbbails); + dest.writeStrongInterface(retriever); + } + + public void readFromParcel(Parcel source) { + if (source.readInt() != 0) { + mainThumbnail = Bitmap.CREATOR.createFromParcel(source); + } else { + mainThumbnail = null; + } + numSubThumbbails = source.readInt(); + retriever = IThumbnailRetriever.Stub.asInterface(source.readStrongBinder()); + } + + public static final Creator<TaskThumbnails> CREATOR = new Creator<TaskThumbnails>() { + public TaskThumbnails createFromParcel(Parcel source) { + return new TaskThumbnails(source); + } + public TaskThumbnails[] newArray(int size) { + return new TaskThumbnails[size]; + } + }; + + private TaskThumbnails(Parcel source) { + readFromParcel(source); + } + } + + /** @hide */ + public TaskThumbnails getTaskThumbnails(int id) throws SecurityException { try { - return ActivityManagerNative.getDefault().getTaskThumbnail(id); + return ActivityManagerNative.getDefault().getTaskThumbnails(id); } catch (RemoteException e) { // System dead, we will be dead too soon! return null; |