Merge "Launch activity if click on a TaskView which has the task running on...

package com.android.quickstep.views;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.widget.Toast.LENGTH_SHORT;

import static com.android.launcher3.AbstractFloatingView.TYPE_TASK_MENU;

import android.util.AttributeSet;

import android.util.FloatProperty;

import android.util.Log;

import android.view.Display;

import android.view.MotionEvent;

import android.view.TouchDelegate;

import android.view.View;

                // If the recents animation is cancelled somehow between the parent if block and

                // here, try to launch the task as a non live tile task.

                launchTaskAnimated();

                mIsClickableAsLiveTile = true;

                return;

            }

                @Override

                public void onAnimationEnd(Animator animator) {

                    if (mTask != null && mTask.key.displayId != getRootViewDisplayId()) {

                        launchTaskAnimated();

                    }

                    mIsClickableAsLiveTile = true;

                }

            });

    private int getRootViewDisplayId() {

        return getRootView().getDisplay().getDisplayId();

        Display  display = getRootView().getDisplay();

        return display != null ? display.getDisplayId() : DEFAULT_DISPLAY;

    }

    /**