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

Commit d67be770 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Merging from ub-launcher3-rvc-dev @ build 6538292 

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6538292.html

Change-Id: I53b084ca2dc94d94f87d696bbfd7666b55d712ad
parents f7107934 065c84cb

protos/launcher_atom.proto

+11 −0
Original line number Diff line number Diff line
@@ -49,15 +49,26 @@ message ContainerInfo { 
    FolderContainer folder = 3;

    AllAppsContainer all_apps_container = 4;

    WidgetsContainer widgets_container = 5;

    PredictionContainer prediction_container = 6;

    SearchResultContainer search_result_container = 7;

  }

}



// Represents the apps list sorted alphabetically inside the all-apps view.

message AllAppsContainer {

}



message WidgetsContainer {

}



// Represents the predicted apps row(top row) in the all-apps view.

message PredictionContainer {

}



// Represents the apps container within search results.

message SearchResultContainer {

}



enum Origin {

  UNKNOWN = 0;

  DEFAULT_LAYOUT = 1;       // icon automatically placed in workspace, folder, hotseat

quickstep/recents_ui_overrides/res/layout/fallback_recents_activity.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    android:id="@+id/drag_layer"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:clipChildren="false"

    android:fitsSystemWindows="true">



    <com.android.quickstep.fallback.FallbackRecentsView

quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+6 −4
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.launcher3; 
import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.anim.Interpolators.AGGRESSIVE_EASE;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;

import static com.android.quickstep.TaskViewUtils.findTaskViewToLaunch;

import static com.android.quickstep.TaskViewUtils.getRecentsWindowAnimator;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -34,6 +34,7 @@ import androidx.annotation.Nullable; 


import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.anim.PendingAnimation;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -63,9 +64,10 @@ public final class LauncherAppTransitionManagerImpl extends QuickstepAppTransiti 
        boolean skipLauncherChanges = !launcherClosing;



        TaskView taskView = findTaskViewToLaunch(mLauncher, v, appTargets);

        Animator recentsAnimator = getRecentsWindowAnimator(taskView, skipLauncherChanges,

                appTargets, wallpaperTargets, mLauncher.getDepthController());

        anim.play(recentsAnimator.setDuration(RECENTS_LAUNCH_DURATION));

        PendingAnimation pa = new PendingAnimation(RECENTS_LAUNCH_DURATION);

        createRecentsWindowAnimator(taskView, skipLauncherChanges, appTargets, wallpaperTargets,

                mLauncher.getDepthController(), pa);

        anim.play(pa.buildAnim());



        Animator childStateAnimation = null;

        // Found a visible recents task that matches the opening app, lets launch the app from there

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+5 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.hybridhotseat;



import static com.android.launcher3.InvariantDeviceProfile.CHANGE_FLAG_GRID;

import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;



import android.animation.Animator;
@@ -571,9 +572,11 @@ public class HotseatPredictionController implements DragController.DragListener, 


    @Override

    public void onIdpChanged(int changeFlags, InvariantDeviceProfile profile) {

        if ((changeFlags & CHANGE_FLAG_GRID) != 0) {

            this.mHotSeatItemsCount = profile.numHotseatIcons;

            createPredictor();

        }

    }



    @Override

    public void onAppsUpdated() {

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −8
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
        super.onCreate(savedInstanceState);

        if (FeatureFlags.ENABLE_HYBRID_HOTSEAT.get()) {

            mHotseatPredictionController = new HotseatPredictionController(this);

            mHotseatPredictionController.createPredictor();

        }

    }
@@ -177,14 +178,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
        }

    }



    @Override

    public void finishBindingItems(int pageBoundFirst) {

        super.finishBindingItems(pageBoundFirst);

        if (mHotseatPredictionController != null) {

            mHotseatPredictionController.createPredictor();

        }

    }



    @Override

    public void bindPredictedItems(List<AppInfo> appInfos, IntArray ranks) {

        super.bindPredictedItems(appInfos, ranks);