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

Commit fc1db586 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Check if RecentsView is null before setting live tile icon." into ub-launcher3-qt-dev

parents ca292596 6594390a

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+12 −0
Original line number Diff line number Diff line
@@ -17,7 +17,12 @@ package com.android.quickstep; 


import static android.view.MotionEvent.ACTION_DOWN;



import static com.android.launcher3.config.FeatureFlags.ADAPTIVE_ICON_WINDOW_ANIM;

import static com.android.launcher3.config.FeatureFlags.APPLY_CONFIG_AT_RUNTIME;

import static com.android.launcher3.config.FeatureFlags.ENABLE_HINTS_IN_OVERVIEW;

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.config.FeatureFlags.FAKE_LANDSCAPE_UI;

import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_INPUT_MONITOR;

import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_A11Y_BUTTON_CLICKABLE;
@@ -664,6 +669,13 @@ public class TouchInteractionService extends Service implements 
                mSwipeSharedState.dump("    ", pw);

            }

            pw.println("  mConsumer=" + mConsumer.getName());

            pw.println("FeatureFlags:");

            pw.println("  APPLY_CONFIG_AT_RUNTIME=" + APPLY_CONFIG_AT_RUNTIME.get());

            pw.println("  QUICKSTEP_SPRINGS=" + QUICKSTEP_SPRINGS.get());

            pw.println("  ADAPTIVE_ICON_WINDOW_ANIM=" + ADAPTIVE_ICON_WINDOW_ANIM.get());

            pw.println("  ENABLE_QUICKSTEP_LIVE_TILE=" + ENABLE_QUICKSTEP_LIVE_TILE.get());

            pw.println("  ENABLE_HINTS_IN_OVERVIEW=" + ENABLE_HINTS_IN_OVERVIEW.get());

            pw.println("  FAKE_LANDSCAPE_UI=" + FAKE_LANDSCAPE_UI.get());

            TOUCH_INTERACTION_LOG.dump("", pw);



        }

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

+6 −2
Original line number Diff line number Diff line
@@ -353,14 +353,15 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
            mIconLoadRequest = iconCache.updateIconInBackground(mTask,

                    (task) -> {

                        setIcon(task.icon);

                        if (isRunningTask()) {

                        if (ENABLE_QUICKSTEP_LIVE_TILE.get() && isRunningTask()) {

                            getRecentsView().updateLiveTileIcon(task.icon);

                        }

                        mDigitalWellBeingToast.initialize(

                                mTask,

                                contentDescription -> {

                                    setContentDescription(contentDescription);

                                    if (mDigitalWellBeingToast.getVisibility() == VISIBLE) {

                                    if (mDigitalWellBeingToast.getVisibility() == VISIBLE

                                            && getRecentsView() != null) {

                                        getRecentsView().onDigitalWellbeingToastShown();

                                    }

                                });
@@ -716,6 +717,9 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
    }



    public boolean isRunningTask() {

        if (getRecentsView() == null) {

            return false;

        }

        return this == getRecentsView().getRunningTaskView();

    }