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

Commit 4250557a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ic23997f1,Id45c5381 into ub-launcher3-master 

* changes:
  Enable trim memory callbacks to the loader, background task preloading
  Only load thumbnails for visible tasks.
parents c06a7e13 62a70be2

quickstep/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ 
    <dimen name="task_fade_length">20dp</dimen>

    <dimen name="recents_page_spacing">10dp</dimen>



    <!-- The speed in dp/s at which the user needs to be scrolling in recents such that we start

             loading full resolution screenshots. -->

    <dimen name="recents_fast_fling_velocity">600dp</dimen>



    <dimen name="quickstep_fling_threshold_velocity">500dp</dimen>

    <dimen name="quickstep_fling_min_velocity">250dp</dimen>

quickstep/src/com/android/launcher3/uioverrides/UiFactory.java

+15 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.launcher3.config.FeatureFlags; 
import com.android.launcher3.graphics.BitmapRenderer;

import com.android.launcher3.util.TouchController;

import com.android.quickstep.OverviewInteractionState;

import com.android.quickstep.RecentsModel;

import com.android.quickstep.RecentsView;

import com.android.systemui.shared.recents.view.RecentsTransition;
@@ -88,4 +89,18 @@ public class UiFactory { 
        RecentsView recents = launcher.getOverviewPanel();

        recents.reset();

    }



    public static void onStart(Launcher launcher) {

        RecentsModel model = RecentsModel.getInstance(launcher);

        if (model != null) {

            model.onStart();

        }

    }



    public static void onTrimMemory(Launcher launcher, int level) {

        RecentsModel model = RecentsModel.getInstance(launcher);

        if (model != null) {

            model.onTrimMemory(level);

        }

    }

}

quickstep/src/com/android/quickstep/RecentsModel.java

+47 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
package com.android.quickstep;



import android.annotation.TargetApi;

import android.app.ActivityManager;

import android.content.ComponentCallbacks2;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.ActivityInfo;
@@ -29,6 +31,7 @@ import android.support.annotation.WorkerThread; 
import android.util.LruCache;

import android.util.SparseArray;



import com.android.launcher3.Launcher;

import com.android.launcher3.MainThreadExecutor;

import com.android.launcher3.R;

import com.android.launcher3.util.Preconditions;
@@ -51,7 +54,6 @@ import java.util.function.Consumer; 
 */

@TargetApi(Build.VERSION_CODES.O)

public class RecentsModel extends TaskStackChangeListener {



    // We do not need any synchronization for this variable as its only written on UI thread.

    private static RecentsModel INSTANCE;
@@ -83,10 +85,16 @@ public class RecentsModel extends TaskStackChangeListener { 
    private int mTaskChangeId;

    private ISystemUiProxy mSystemUiProxy;

    private boolean mClearAssistCacheOnStackChange = true;

    private final boolean mPreloadTasksInBackground;



    private RecentsModel(Context context) {

        mContext = context;



        ActivityManager activityManager =

                (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);

        mPreloadTasksInBackground = !activityManager.isLowRamDevice();

        mMainThreadExecutor = new MainThreadExecutor();



        Resources res = context.getResources();

        mRecentsTaskLoader = new RecentsTaskLoader(mContext,

                res.getInteger(R.integer.config_recentsMaxThumbnailCacheSize),
@@ -100,8 +108,6 @@ public class RecentsModel extends TaskStackChangeListener { 
            }

        };

        mRecentsTaskLoader.startLoader(mContext);



        mMainThreadExecutor = new MainThreadExecutor();

        ActivityManagerWrapper.getInstance().registerTaskStackListener(this);



        mTaskChangeId = 1;
@@ -162,6 +168,31 @@ public class RecentsModel extends TaskStackChangeListener { 
        }

    }



    @Override

    public void onTaskStackChangedBackground() {

        int userId = UserHandle.myUserId();

        if (!mPreloadTasksInBackground || !checkCurrentUserId(userId, false /* debug */)) {

            // TODO: Only register this for the current user

            return;

        }



        // Preload a fixed number of task icons/thumbnails in the background

        ActivityManager.RunningTaskInfo runningTaskInfo =

                ActivityManagerWrapper.getInstance().getRunningTask();

        RecentsTaskLoadPlan plan = new RecentsTaskLoadPlan(mContext);

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

        launchOpts.runningTaskId = runningTaskInfo != null ? runningTaskInfo.id : -1;

        launchOpts.numVisibleTasks = 2;

        launchOpts.numVisibleTaskThumbnails = 2;

        launchOpts.onlyLoadForCache = true;

        launchOpts.onlyLoadPausedActivities = true;

        launchOpts.loadThumbnails = true;

        PreloadOptions preloadOpts = new PreloadOptions();

        preloadOpts.loadTitles = false;

        plan.preloadPlan(preloadOpts, mRecentsTaskLoader, -1, userId);

        mRecentsTaskLoader.loadTasks(plan, launchOpts);

    }



    public boolean isLoadPlanValid(int resultId) {

        return mTaskChangeId == resultId;

    }
@@ -178,6 +209,19 @@ public class RecentsModel extends TaskStackChangeListener { 
        return mSystemUiProxy;

    }



    public void onStart() {

        mRecentsTaskLoader.startLoader(mContext);

        mRecentsTaskLoader.getHighResThumbnailLoader().setVisible(true);

    }



    public void onTrimMemory(int level) {

        if (level == ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) {

            // We already stop the loader in UI_HIDDEN, so stop the high res loader as well

            mRecentsTaskLoader.getHighResThumbnailLoader().setVisible(false);

        }

        mRecentsTaskLoader.onTrimMemory(level);

    }



    @WorkerThread

    public void preloadAssistData(int taskId, Bundle data) {

        mMainThreadExecutor.execute(() -> {

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

+82 −7
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@ import static com.android.quickstep.TaskView.CURVE_FACTOR; 
import static com.android.quickstep.TaskView.CURVE_INTERPOLATOR;



import android.animation.LayoutTransition;

import android.animation.LayoutTransition.TransitionListener;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.BitmapShader;

import android.graphics.Canvas;
@@ -38,8 +40,10 @@ import android.graphics.Shader.TileMode; 
import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.util.AttributeSet;

import android.util.SparseBooleanArray;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.FrameLayout;



import com.android.launcher3.DeviceProfile;
@@ -82,6 +86,8 @@ public class RecentsView extends PagedView implements Insettable, OnSharedPrefer 
    private LayoutTransition mLayoutTransition;

    private Runnable mNextPageSwitchRunnable;



    private float mFastFlingVelocity;



    /**

     * TODO: Call reloadIdNeeded in onTaskStackChanged.

     */
@@ -114,6 +120,7 @@ public class RecentsView extends PagedView implements Insettable, OnSharedPrefer 
    private boolean mScrimOnLeft;



    private boolean mFirstTaskIconScaledDown = false;

    private SparseBooleanArray mPrevVisibleTasks = new SparseBooleanArray();



    public RecentsView(Context context) {

        this(context, null);
@@ -167,19 +174,37 @@ public class RecentsView extends PagedView implements Insettable, OnSharedPrefer 


    private void setupLayoutTransition() {

        // We want to show layout transitions when pages are deleted, to close the gap.

        // TODO: We should this manually so we can control the animation (fill in the gap as the

        // dismissing task is being tracked, and also so we can update the visible task data during

        // the transition. For now, the workaround is to expand the visible tasks to load.

        mLayoutTransition = new LayoutTransition();

        mLayoutTransition.enableTransitionType(LayoutTransition.DISAPPEARING);

        mLayoutTransition.enableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);



        mLayoutTransition.disableTransitionType(LayoutTransition.APPEARING);

        mLayoutTransition.disableTransitionType(LayoutTransition.CHANGE_APPEARING);

        mLayoutTransition.addTransitionListener(new TransitionListener() {

            @Override

            public void startTransition(LayoutTransition layoutTransition, ViewGroup viewGroup,

                    View view, int i) {

                loadVisibleTaskData();

            }



            @Override

            public void endTransition(LayoutTransition layoutTransition, ViewGroup viewGroup,

                    View view, int i) {

                loadVisibleTaskData();

            }

        });

        setLayoutTransition(mLayoutTransition);

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        Resources res = getResources();

        mFirstTaskIndex = getPageCount();

        mFastFlingVelocity = res.getDimensionPixelSize(R.dimen.recents_fast_fling_velocity);

    }



    @Override
@@ -307,20 +332,25 @@ public class RecentsView extends PagedView implements Insettable, OnSharedPrefer 
        }

        while (getChildCount() > requiredChildCount) {

            final TaskView taskView = (TaskView) getChildAt(getChildCount() - 1);

            final Task task = taskView.getTask();

            removeView(taskView);

            loader.unloadTaskData(taskView.getTask());

            loader.unloadTaskData(task);

            loader.getHighResThumbnailLoader().onTaskInvisible(task);

        }

        setLayoutTransition(mLayoutTransition);



        // Rebind and reset all task views

        for (int i = tasks.size() - 1; i >= 0; i--) {

            final int pageIndex = tasks.size() - i - 1 + mFirstTaskIndex;

            final Task task = tasks.get(i);

            final TaskView taskView = (TaskView) getChildAt(tasks.size() - i - 1 + mFirstTaskIndex);

            final TaskView taskView = (TaskView) getChildAt(pageIndex);

            taskView.bind(task);

            taskView.resetVisualProperties();

            loader.loadTaskData(task);

        }

        updateCurveProperties();

        // Reload the set of visible task's data

        mPrevVisibleTasks.clear();

        loadVisibleTaskData();

        applyIconScale(false /* animate */);



        if (oldChildCount != getChildCount()) {
@@ -414,9 +444,24 @@ public class RecentsView extends PagedView implements Insettable, OnSharedPrefer 
    }



    @Override

    public void computeScroll() {

        super.computeScroll();

    protected boolean computeScrollHelper() {

        boolean scrolling = super.computeScrollHelper();

        boolean isFlingingFast = false;

        updateCurveProperties();

        if (scrolling || (mTouchState == TOUCH_STATE_SCROLLING)) {

            if (scrolling) {

                // Check if we are flinging quickly to disable high res thumbnail loading

                isFlingingFast = mScroller.getCurrVelocity() > mFastFlingVelocity;

            }



            // After scrolling, update the visible task's data

            loadVisibleTaskData();

        }



        // Update the high res thumbnail loader

        RecentsTaskLoader loader = mModel.getRecentsTaskLoader();

        loader.getHighResThumbnailLoader().setFlingingFast(isFlingingFast);

        return scrolling;

    }



    /**
@@ -444,6 +489,34 @@ public class RecentsView extends PagedView implements Insettable, OnSharedPrefer 
        }

    }



    /**

     * Iterates through all thet asks, and loads the associated task data for newly visible tasks,

     * and unloads the associated task data for tasks that are no longer visible.

     */

    private void loadVisibleTaskData() {

        RecentsTaskLoader loader = mModel.getRecentsTaskLoader();

        int centerPageIndex = getPageNearestToCenterOfScreen();

        int lower = Math.max(mFirstTaskIndex, centerPageIndex - 2);

        int upper = Math.min(centerPageIndex + 2, getChildCount() - 1);

        for (int i = mFirstTaskIndex; i < getChildCount(); i++) {

            TaskView taskView = (TaskView) getChildAt(i);

            Task task = taskView.getTask();

            boolean visible = lower <= i && i <= upper;

            if (visible) {

                if (!mPrevVisibleTasks.get(i)) {

                    loader.loadTaskData(task);

                    loader.getHighResThumbnailLoader().onTaskVisible(task);

                }

            } else {

                if (mPrevVisibleTasks.get(i)) {

                    loader.unloadTaskData(task);

                    loader.getHighResThumbnailLoader().onTaskInvisible(task);

                }

            }

            mPrevVisibleTasks.put(i, visible);

        }

    }



    public void onTaskDismissed(TaskView taskView) {

        ActivityManagerWrapper.getInstance().removeTask(taskView.getTask().key.id);

        removeView(taskView);
@@ -493,14 +566,16 @@ public class RecentsView extends PagedView implements Insettable, OnSharedPrefer 
            addView(taskView, mFirstTaskIndex);

            setLayoutTransition(mLayoutTransition);

        }

        mRunningTaskId = runningTaskId;

        setCurrentPage(mFirstTaskIndex);

        if (!needsReload) {

            needsReload = !mModel.isLoadPlanValid(mLoadPlanId);

        }

        if (needsReload) {

            mLoadPlanId = mModel.loadTasks(runningTaskId, this::applyLoadPlan);

        } else {

            loadVisibleTaskData();

        }

        mRunningTaskId = runningTaskId;

        setCurrentPage(mFirstTaskIndex);

        if (mCurrentPage >= mFirstTaskIndex) {

            getPageAt(mCurrentPage).setAlpha(0);

        }

src/com/android/launcher3/Launcher.java

+2 −0
Original line number Diff line number Diff line
@@ -829,6 +829,7 @@ public class Launcher extends BaseActivity 
            mScrimAnimator.start();

        }

        mShouldFadeInScrim = false;

        UiFactory.onStart(this);

    }



    @Override
@@ -2171,6 +2172,7 @@ public class Launcher extends BaseActivity 
        if (mLauncherCallbacks != null) {

            mLauncherCallbacks.onTrimMemory(level);

        }

        UiFactory.onTrimMemory(this, level);

    }



    @Override