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

Commit cde5bd63 authored by Adam Cohen's avatar Adam Cohen Committed by android-build-merger
Browse files

Merging ub-launcher3-qt-r1-dev, build 5758528 am: 574d6c15 am: 41bc71de 

am: 23177427

Change-Id: I9db4693ba113e984127ac45ee50142b19955751e
parents 208729c3 23177427

SecondaryDisplayLauncher/res/values-zh-rTW/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="couldnt_launch" msgid="7873588052226763866">"無法啟動活動"</string>

    <string name="add_app_shortcut" msgid="2756755330707509435">"新增應用程式捷徑"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"設定桌布"</string>

    <string name="set_wallpaper" msgid="6475195450505435904">"套用桌布"</string>

</resources>

go/quickstep/src/com/android/quickstep/AppToOverviewAnimationProvider.java

+3 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.systemui.shared.system.RemoteAnimationTargetCompat.MOD 
import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.app.ActivityOptions;

import android.content.Context;

import android.os.Handler;

import android.util.Log;
@@ -151,7 +152,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
    }



    @Override

    public ActivityOptions toActivityOptions(Handler handler, long duration) {

    public ActivityOptions toActivityOptions(Handler handler, long duration, Context context) {

        LauncherAnimationRunner runner = new LauncherAnimationRunner(handler,

                false /* startAtFrontOfQueue */) {
@@ -165,7 +166,7 @@ final class AppToOverviewAnimationProvider<T extends BaseDraggingActivity> imple 
                    );

                    return;

                }

                result.setAnimation(createWindowAnimation(targetCompats));

                result.setAnimation(createWindowAnimation(targetCompats), context);

            }

        };

        return ActivityOptionsCompat.makeRemoteAnimation(

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

+1 −2
Original line number Diff line number Diff line
@@ -165,8 +165,7 @@ public abstract class RecentsUiFactory { 
        }



        if (FeatureFlags.PULL_DOWN_STATUS_BAR

                && !launcher.getDeviceProfile().isMultiWindowMode

                && !launcher.getDeviceProfile().isVerticalBarLayout()) {

                && !launcher.getDeviceProfile().isMultiWindowMode) {

            list.add(new StatusBarTouchController(launcher));

        }

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; 


import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.Launcher;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.quickstep.util.LayoutUtils;
@@ -68,8 +69,8 @@ public class BackgroundAppState extends OverviewState { 
        if (taskCount == 0) {

            return super.getOverviewScaleAndTranslation(launcher);

        }

        TaskView dummyTask = recentsView.getTaskViewAt(Math.max(taskCount - 1,

                recentsView.getCurrentPage()));

        TaskView dummyTask = recentsView.getTaskViewAt(Utilities.boundToRange(

                recentsView.getCurrentPage(), 0, taskCount - 1));

        return recentsView.getTempClipAnimationHelper().updateForFullscreenOverview(dummyTask)

                .getScaleAndTranslation();

    }

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
package com.android.launcher3.uioverrides.touchcontrollers;



import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE;

import static com.android.launcher3.Utilities.SINGLE_FRAME_MS;

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

import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;

import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS;

import static com.android.launcher3.util.DefaultDisplay.getSingleFrameMs;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -266,8 +266,8 @@ public abstract class TaskViewTouchController<T extends BaseDraggingActivity> 
            animationDuration *= LauncherAnimUtils.blockedFlingDurationFactor(velocity);

        }



        float nextFrameProgress = Utilities.boundToRange(

                progress + velocity * SINGLE_FRAME_MS / Math.abs(mEndDisplacement), 0f, 1f);

        float nextFrameProgress = Utilities.boundToRange(progress

                + velocity * getSingleFrameMs(mActivity) / Math.abs(mEndDisplacement), 0f, 1f);



        mCurrentAnimation.setEndAction(() -> onCurrentAnimationEnd(goingToEnd, logAction));