Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev (a3045640) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,7 @@ import com.android.systemui.recents.model.RecentsTaskLoader;
	import com.android.systemui.recents.model.Task;		import com.android.systemui.recents.model.Task;
	import com.android.systemui.recents.model.TaskGrouping;		import com.android.systemui.recents.model.TaskGrouping;
	import com.android.systemui.recents.model.TaskStack;		import com.android.systemui.recents.model.TaskStack;
			import com.android.systemui.recents.model.ThumbnailData;
	import com.android.systemui.recents.views.RecentsTransitionHelper;		import com.android.systemui.recents.views.RecentsTransitionHelper;
	import com.android.systemui.recents.views.RecentsTransitionHelper.AppTransitionAnimationSpecsFuture;		import com.android.systemui.recents.views.RecentsTransitionHelper.AppTransitionAnimationSpecsFuture;
	import com.android.systemui.recents.views.TaskStackLayoutAlgorithm;		import com.android.systemui.recents.views.TaskStackLayoutAlgorithm;
	@@ -199,7 +200,8 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
	return;		return;
	}		}

	EventBus.getDefault().send(new TaskSnapshotChangedEvent(taskId, snapshot));		EventBus.getDefault().send(new TaskSnapshotChangedEvent(taskId,
			ThumbnailData.createFromTaskSnapshot(snapshot)));
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/recents/events/ui/TaskSnapshotChangedEvent.java

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,8 @@

	package com.android.systemui.recents.events.ui;		package com.android.systemui.recents.events.ui;

	import android.app.ActivityManager.TaskSnapshot;

	import com.android.systemui.recents.events.EventBus;		import com.android.systemui.recents.events.EventBus;
			import com.android.systemui.recents.model.ThumbnailData;

	/**		/**
	* Sent when a task snapshot has changed.		* Sent when a task snapshot has changed.
	@@ -26,10 +25,10 @@ import com.android.systemui.recents.events.EventBus;
	public class TaskSnapshotChangedEvent extends EventBus.Event {		public class TaskSnapshotChangedEvent extends EventBus.Event {

	public final int taskId;		public final int taskId;
	public final TaskSnapshot taskSnapshot;		public final ThumbnailData thumbnailData;

	public TaskSnapshotChangedEvent(int taskId, TaskSnapshot taskSnapshot) {		public TaskSnapshotChangedEvent(int taskId, ThumbnailData thumbnailData) {
	this.taskId = taskId;		this.taskId = taskId;
	this.taskSnapshot = taskSnapshot;		this.thumbnailData = thumbnailData;
	}		}
	}		}

packages/SystemUI/src/com/android/systemui/recents/views/TaskViewThumbnail.java

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	package com.android.systemui.recents.views;		package com.android.systemui.recents.views;

	import android.app.ActivityManager;
	import android.content.Context;		import android.content.Context;
	import android.content.res.Configuration;		import android.content.res.Configuration;
	import android.content.res.Resources;		import android.content.res.Resources;
	@@ -37,7 +36,6 @@ import android.view.ViewDebug;

	import com.android.systemui.R;		import com.android.systemui.R;
	import com.android.systemui.recents.events.EventBus;		import com.android.systemui.recents.events.EventBus;
	import com.android.systemui.recents.events.EventBus.Event;
	import com.android.systemui.recents.events.ui.TaskSnapshotChangedEvent;		import com.android.systemui.recents.events.ui.TaskSnapshotChangedEvent;
	import com.android.systemui.recents.misc.Utilities;		import com.android.systemui.recents.misc.Utilities;
	import com.android.systemui.recents.model.Task;		import com.android.systemui.recents.model.Task;
	@@ -386,15 +384,14 @@ public class TaskViewThumbnail extends View {
	}		}

	public final void onBusEvent(TaskSnapshotChangedEvent event) {		public final void onBusEvent(TaskSnapshotChangedEvent event) {
	if (mTask == null \|\| event.taskId != mTask.key.id \|\| event.taskSnapshot == null) {		if (mTask == null \|\| event.taskId != mTask.key.id \|\| event.thumbnailData == null
			\|\| event.thumbnailData.thumbnail == null) {
	return;		return;
	}		}
	setThumbnail(ThumbnailData.createFromTaskSnapshot(event.taskSnapshot));		setThumbnail(event.thumbnailData);
	}		}

	public void dump(String prefix, PrintWriter writer) {		public void dump(String prefix, PrintWriter writer) {
	String innerPrefix = prefix + " ";

	writer.print(prefix); writer.print("TaskViewThumbnail");		writer.print(prefix); writer.print("TaskViewThumbnail");
	writer.print(" mTaskViewRect="); writer.print(Utilities.dumpRect(mTaskViewRect));		writer.print(" mTaskViewRect="); writer.print(Utilities.dumpRect(mTaskViewRect));
	writer.print(" mThumbnailRect="); writer.print(Utilities.dumpRect(mThumbnailRect));		writer.print(" mThumbnailRect="); writer.print(Utilities.dumpRect(mThumbnailRect));