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

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

Merge changes Iaeeca788,I305b659d into ub-launcher3-master 

* changes:
  Fetching graphic buffer instead of bitmap for current screenshot.
  Add option to not preload titles.
parents af3a3277 0485e357

quickstep/libs/sysui_shared.jar

+3.82 KiB (91 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

quickstep/src/com/android/quickstep/RecentsActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.support.annotation.Nullable; 
import android.widget.ArrayAdapter;



import com.android.systemui.shared.recents.model.RecentsTaskLoadPlan;

import com.android.systemui.shared.recents.model.RecentsTaskLoadPlan.PreloadOptions;

import com.android.systemui.shared.recents.model.RecentsTaskLoader;

import com.android.systemui.shared.recents.model.Task;
@@ -37,7 +38,8 @@ public class RecentsActivity extends ListActivity { 
        super.onCreate(savedInstanceState);



        RecentsTaskLoadPlan plan = new RecentsTaskLoadPlan(this);

        plan.preloadPlan(new RecentsTaskLoader(this, 1, 1, 0), -1, UserHandle.myUserId());

        plan.preloadPlan(new PreloadOptions(), new RecentsTaskLoader(this, 1, 1, 0), -1,

                UserHandle.myUserId());



        mAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1);

        mAdapter.addAll(plan.getTaskStack().getTasks());

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

+6 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.launcher3.R; 
import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;

import com.android.systemui.shared.recents.model.RecentsTaskLoadPlan;

import com.android.systemui.shared.recents.model.RecentsTaskLoadPlan.PreloadOptions;

import com.android.systemui.shared.recents.model.RecentsTaskLoader;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.BackgroundExecutor;
@@ -216,6 +217,7 @@ public class TouchInteractionService extends Service { 
            // Start the launcher activity with our custom handler

            Intent homeIntent = handler.addToIntent(new Intent(mHomeIntent));

            startActivity(homeIntent, ActivityOptions.makeCustomAnimation(this, 0, 0).toBundle());



            /*

            ActivityManagerWrapper.getInstance().startRecentsActivity(null, options,

                    ActivityOptions.makeCustomAnimation(this, 0, 0), UserHandle.myUserId(),
@@ -224,7 +226,9 @@ public class TouchInteractionService extends Service { 


            // Preload the plan

            RecentsTaskLoader loader = TouchInteractionService.getRecentsTaskLoader();

            loadPlan.preloadPlan(loader, taskId, UserHandle.myUserId());

            PreloadOptions opts = new PreloadOptions();

            opts.loadTitles = false;

            loadPlan.preloadPlan(opts, loader, taskId, UserHandle.myUserId());

            // Set the load plan on UI thread

            mMainThreadExecutor.execute(() -> handler.setRecentsTaskLoadPlan(loadPlan));

        });
@@ -252,7 +256,7 @@ public class TouchInteractionService extends Service { 
        // TODO: We are using some hardcoded layers for now, to best approximate the activity layers

        try {

            return mISystemUiProxy.screenshot(new Rect(), mDisplaySize.x, mDisplaySize.y, 0, 100000,

                    false, mDisplayRotation);

                    false, mDisplayRotation).toBitmap();

        } catch (RemoteException e) {

            Log.e(TAG, "Error capturing snapshot", e);

            return null;