Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97604764 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Also notify the user when a task view fails to launch." into ub-launcher3-edmonton

parents a269a818 6dceb775

quickstep/src/com/android/quickstep/TaskSystemShortcut.java

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.util.Log;

import android.view.View;

import android.view.ViewTreeObserver.OnPreDrawListener;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BaseDraggingActivity;
@@ -239,7 +238,7 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
                            Log.w(TAG, "Failed to start screen pinning: ", e);

                        }

                    } else {

                        Log.w(TAG, taskView.getLaunchTaskFailedMsg());

                        taskView.notifyTaskLaunchFailed(TAG);

                    }

                };

                taskView.launchTask(true, resultCallback, mHandler);

quickstep/src/com/android/quickstep/views/RecentsView.java

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl 
            tv.setVisibility(VISIBLE);

            getOverlay().remove(drawable);

            if (!result) {

                Log.w(TAG, tv.getLaunchTaskFailedMsg());

                tv.notifyTaskLaunchFailed(TAG);

            }

        };

quickstep/src/com/android/quickstep/views/TaskView.java

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


package com.android.quickstep.views;



import static android.widget.Toast.LENGTH_SHORT;

import static com.android.quickstep.views.TaskThumbnailView.DIM_ALPHA;



import android.animation.Animator;
@@ -36,6 +37,7 @@ import android.view.accessibility.AccessibilityNodeInfo; 
import android.widget.FrameLayout;

import android.widget.ImageView;



import android.widget.Toast;

import com.android.launcher3.BaseActivity;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.R;
@@ -138,7 +140,7 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback 
    public void launchTask(boolean animate) {

        launchTask(animate, (result) -> {

            if (!result) {

                Log.w(TAG, getLaunchTaskFailedMsg());

                notifyTaskLaunchFailed(TAG);

            }

        }, getHandler());

    }
@@ -312,11 +314,12 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback 
        return super.performAccessibilityAction(action, arguments);

    }



    public String getLaunchTaskFailedMsg() {

    public void notifyTaskLaunchFailed(String tag) {

        String msg = "Failed to launch task";

        if (mTask != null) {

            msg += " (task=" + mTask.key.baseIntent + " userId=" + mTask.key.userId + ")";

        }

        return msg;

        Log.w(tag, msg);

        Toast.makeText(getContext(), R.string.activity_not_available, LENGTH_SHORT).show();

    }

}