summaryrefslogtreecommitdiffstats
path: root/tests/ActivityTests
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-07-01 12:38:52 -0700
committerCraig Mautner <cmautner@google.com>2014-07-02 16:31:46 -0700
commitc0ffce5ddd6446f1d46a49cdfaeda4a2ce408e1d (patch)
treed35f14610cdd43912a963295aa6719ae596a1669 /tests/ActivityTests
parent51cb97096814352127aed69e5ac97013e9172038 (diff)
downloadframeworks_base-c0ffce5ddd6446f1d46a49cdfaeda4a2ce408e1d.zip
frameworks_base-c0ffce5ddd6446f1d46a49cdfaeda4a2ce408e1d.tar.gz
frameworks_base-c0ffce5ddd6446f1d46a49cdfaeda4a2ce408e1d.tar.bz2
Use cached thumbnails in Recent tasks.
The thumbnail returned from ActivityManager.getTaskThumbnail() now contains either a Bitmap or a ParcelFileDescriptor that points to a file containing a compressed Bitmap. The Recent tasks list is now responsible for all thumbnail Bitmap caching as the activity manager keeps only the most recent 5. This also permits low memory devices to have many more tasks in the Recent tasks list. As part of this CL the concept of subtasks is removed eliminating code supporting the TaskAccessInfo and IThumbnailRetriever classes. Fixes bug 15828934. Change-Id: I0fd0320a1a04e3c78d79357899b83a2fff97abf2
Diffstat (limited to 'tests/ActivityTests')
-rw-r--r--tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java18
1 files changed, 4 insertions, 14 deletions
diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
index d7a6c1d..0e063d6 100644
--- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
+++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java
@@ -72,7 +72,7 @@ public class ActivityTestMain extends Activity {
private void addThumbnail(LinearLayout container, Bitmap bm,
final ActivityManager.RecentTaskInfo task,
- final ActivityManager.TaskThumbnails thumbs, final int subIndex) {
+ final ActivityManager.TaskThumbnail thumbs) {
ImageView iv = new ImageView(this);
if (bm != null) {
iv.setImageBitmap(bm);
@@ -86,9 +86,6 @@ public class ActivityTestMain extends Activity {
@Override
public void onClick(View v) {
if (task.id >= 0 && thumbs != null) {
- if (subIndex < (thumbs.numSubThumbbails-1)) {
- mAm.removeSubTask(task.id, subIndex+1);
- }
mAm.moveTaskToFront(task.id, ActivityManager.MOVE_TASK_WITH_HOME);
} else {
try {
@@ -104,11 +101,7 @@ public class ActivityTestMain extends Activity {
@Override
public boolean onLongClick(View v) {
if (task.id >= 0 && thumbs != null) {
- if (subIndex < 0) {
- mAm.removeTask(task.id, ActivityManager.REMOVE_TASK_KILL_PROCESS);
- } else {
- mAm.removeSubTask(task.id, subIndex);
- }
+ mAm.removeTask(task.id, ActivityManager.REMOVE_TASK_KILL_PROCESS);
buildUi();
return true;
}
@@ -333,7 +326,7 @@ public class ActivityTestMain extends Activity {
if (recents != null) {
for (int i=0; i<recents.size(); i++) {
ActivityManager.RecentTaskInfo r = recents.get(i);
- ActivityManager.TaskThumbnails tt = mAm.getTaskThumbnails(r.persistentId);
+ ActivityManager.TaskThumbnail tt = mAm.getTaskThumbnail(r.persistentId);
TextView tv = new TextView(this);
tv.setText(r.baseIntent.getComponent().flattenToShortString());
top.addView(tv, new LinearLayout.LayoutParams(
@@ -341,10 +334,7 @@ public class ActivityTestMain extends Activity {
LinearLayout.LayoutParams.WRAP_CONTENT));
LinearLayout item = new LinearLayout(this);
item.setOrientation(LinearLayout.HORIZONTAL);
- addThumbnail(item, tt != null ? tt.mainThumbnail : null, r, tt, -1);
- for (int j=0; j<tt.numSubThumbbails; j++) {
- addThumbnail(item, tt.getSubThumbnail(j), r, tt, j);
- }
+ addThumbnail(item, tt != null ? tt.mainThumbnail : null, r, tt);
top.addView(item, new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT));