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

Commit f5060578 authored by Jon's avatar Jon Committed by android-build-merger
Browse files

Merge branch 'ub-launcher3-edmonton-polish' into pi-dev 

am: 170be9be

Change-Id: I887337a41ddf77e4cc4ff5df25f0f9cada10553c
parents 2b9859e8 170be9be

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

+8 −0
Original line number Diff line number Diff line
@@ -165,6 +165,14 @@ public class UiFactory { 
        }

    }



    public static void onEnterAnimationComplete(Context context) {

        // After the transition to home, enable the high-res thumbnail loader if it wasn't enabled

        // as a part of quickstep/scrub, so that high-res thumbnails can load the next time we

        // enter overview

        RecentsModel.getInstance(context).getRecentsTaskLoader()

                .getHighResThumbnailLoader().setVisible(true);

    }



    public static void onLauncherStateOrResumeChanged(Launcher launcher) {

        LauncherState state = launcher.getStateManager().getState();

        DeviceProfile profile = launcher.getDeviceProfile();

quickstep/src/com/android/quickstep/ActivityControlHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -294,6 +294,9 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 
        private void playScaleDownAnim(AnimatorSet anim, Launcher launcher) {

            RecentsView recentsView = launcher.getOverviewPanel();

            TaskView v = recentsView.getTaskViewAt(recentsView.getCurrentPage());

            if (v == null) {

                return;

            }

            ClipAnimationHelper clipHelper = new ClipAnimationHelper();

            clipHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(), null);

            if (!clipHelper.getSourceRect().isEmpty() && !clipHelper.getTargetRect().isEmpty()) {

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

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ public class RecentsActivity extends BaseDraggingActivity { 
        onTrimMemory(TRIM_MEMORY_UI_HIDDEN);

    }



    @Override

    public void onEnterAnimationComplete() {

        super.onEnterAnimationComplete();

        UiFactory.onEnterAnimationComplete(this);

    }



    @Override

    public void onTrimMemory(int level) {

        super.onTrimMemory(level);

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

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ public class RecentsModel extends TaskStackChangeListener { 


    public void onStart() {

        mRecentsTaskLoader.startLoader(mContext);

        mRecentsTaskLoader.getHighResThumbnailLoader().setVisible(true);

    }



    public void onTrimMemory(int level) {

quickstep/src/com/android/quickstep/TaskSystemShortcut.java

+0 −6
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.UserHandle; 
import android.util.Log;

import android.view.View;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.ItemInfo;
@@ -270,9 +269,4 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
            return null;

        }

    }



    private static void dismissTaskMenuView(BaseDraggingActivity activity) {

        AbstractFloatingView.closeOpenViews(activity, true,

                AbstractFloatingView.TYPE_ALL & ~AbstractFloatingView.TYPE_REBIND_SAFE);

    }

}