Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable enter animation when docking by dragging from recents."

Browse Source
This commit is contained in:
Filip Gruszczynski
2016-01-19 20:30:35 +00:00
committed by Android (Google) Code Review
parent 7bdf3cff92 f298e908b9
commit ddd1bc7e46
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,6 +59,7 @@ import android.util.MutableBoolean;
import android.util.Pair;
import android.view.Display;
import android.view.IDockedStackListener;
import android.view.View;
import android.view.WindowManager;
import android.view.WindowManager.KeyboardShortcutsReceiver;
import android.view.WindowManagerGlobal;
@@ -307,12 +308,13 @@ public class SystemServicesProxy {
}
/** Docks a task to the side of the screen and starts it. */
public void startTaskInDockedMode(Context context, int taskId, int createMode) {
public void startTaskInDockedMode(Context context, View view, int taskId, int createMode) {
if (mIam == null) return;
try {
// TODO: Determine what animation we want for the incoming task
final ActivityOptions options = ActivityOptions.makeCustomAnimation(context, 0, 0);
final ActivityOptions options = ActivityOptions.makeThumbnailAspectScaleUpAnimation(
view, null, 0, 0, view.getWidth(), view.getHeight(), null, null);
options.setDockCreateMode(createMode);
options.setLaunchStackId(DOCKED_STACK_ID);
mIam.startActivityFromRecents(taskId, options.toBundle());

5
packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
View File

@@ -526,9 +526,8 @@ public class RecentsView extends FrameLayout {
public void onAnimationEnd(Animator animation) {
// Dock the task and launch it
SystemServicesProxy ssp = Recents.getSystemServices();
ssp.startTaskInDockedMode(getContext(), event.task.key.id,
dockState.createMode);
launchTask(event.task, null, INVALID_STACK_ID);
ssp.startTaskInDockedMode(getContext(), event.taskView,
event.task.key.id, dockState.createMode);
mTaskStackView.getStack().removeTask(event.task);
}