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

Commit 435db7e6 authored by Yoshinori Hirano's avatar Yoshinori Hirano Committed by android-build-merger
Browse files

Merge "Don't include front most excluded task in Multi-Window mode" 

am: a8c2c229

Change-Id: If5c1a8de2cc951d8ec97b40c57cbbc8313137a37
parents 0a7f2d07 a8c2c229

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

+9 −7
Original line number Original line Diff line number Diff line
@@ -392,7 +392,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
        RecentsActivityLaunchState launchState = config.getLaunchState();

        RecentsActivityLaunchState launchState = config.getLaunchState();

        if (!loadPlan.hasTasks()) {

        if (!loadPlan.hasTasks()) {

            loader.preloadTasks(loadPlan, launchState.launchedToTaskId,

            loader.preloadTasks(loadPlan, launchState.launchedToTaskId,

                    !launchState.launchedFromHome);

                    !launchState.launchedFromHome && !launchState.launchedViaDockGesture);

        }

        }





        RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options();

        RecentsTaskLoadPlan.Options loadOpts = new RecentsTaskLoadPlan.Options();
@@ -519,6 +519,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
        EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, false));

        EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, false));

        MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY);

        MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY);





        if (!isChangingConfigurations()) {

            // Workaround for b/22542869, if the RecentsActivity is started again, but without going

            // Workaround for b/22542869, if the RecentsActivity is started again, but without going

            // through SystemUI, we need to reset the config launch flags to ensure that we do not

            // through SystemUI, we need to reset the config launch flags to ensure that we do not

            // wait on the system to send a signal that was never queued.

            // wait on the system to send a signal that was never queued.
@@ -526,6 +527,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD 
            RecentsActivityLaunchState launchState = config.getLaunchState();

            RecentsActivityLaunchState launchState = config.getLaunchState();

            launchState.reset();

            launchState.reset();

        }

        }

    }





    @Override

    @Override

    protected void onDestroy() {

    protected void onDestroy() {