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

Commit ae563e99 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:... 

Merge "Don't include front most excluded task in Multi-Window mode" am: a8c2c229 am: 435db7e6 am: 14ea4073
am: aa6018c7

Change-Id: Ibb292f07718a9782404a84502e475abf0c26c8aa
parents eddb8b0c aa6018c7

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

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

        if (!loadPlan.hasTasks()) {

            loader.preloadTasks(loadPlan, launchState.launchedToTaskId,

                    !launchState.launchedFromHome);

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

        }



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

        MetricsLogger.hidden(this, MetricsEvent.OVERVIEW_ACTIVITY);



        if (!isChangingConfigurations()) {

            // 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

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

            launchState.reset();

        }

    }



    @Override

    protected void onDestroy() {