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

Commit a6a0867b authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Merge "Revert "Introduce library for public animation APIs"" into udc-dev

parents 955555a3 af289a1c

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ android_library { 
        "androidx.test.uiautomator_uiautomator",

        "androidx.preference_preference",

        "SystemUISharedLib",

        "animationlib",

        "SystemUIAnimationLib",

        "launcher-testing-shared",

    ],

    srcs: [
@@ -243,7 +243,7 @@ android_library { 
        "lottie",

        "SystemUISharedLib",

        "SystemUI-statsd",

        "animationlib",

        "SystemUIAnimationLib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    min_sdk_version: "current",
@@ -305,7 +305,7 @@ android_library { 
        "SystemUISharedLib",

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

        "animationlib",

        "SystemUIAnimationLib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,

quickstep/src/com/android/launcher3/taskbar/TaskbarEduTooltip.kt

+3 −3
Original line number Diff line number Diff line
@@ -26,15 +26,15 @@ import android.view.MotionEvent.ACTION_DOWN 
import android.view.View

import android.view.ViewGroup

import android.view.animation.Interpolator

import com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE

import com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE

import com.android.app.animation.Interpolators.STANDARD

import com.android.launcher3.AbstractFloatingView

import com.android.launcher3.R

import com.android.launcher3.anim.AnimatorListeners

import com.android.launcher3.popup.RoundedArrowDrawable

import com.android.launcher3.util.Themes

import com.android.launcher3.views.ActivityContext

import com.android.systemui.animation.Interpolators.EMPHASIZED_ACCELERATE

import com.android.systemui.animation.Interpolators.EMPHASIZED_DECELERATE

import com.android.systemui.animation.Interpolators.STANDARD



private const val ENTER_DURATION_MS = 300L

private const val EXIT_DURATION_MS = 150L

quickstep/src/com/android/launcher3/taskbar/TaskbarLauncherStateController.java

+1 −1
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ 
 */

package com.android.launcher3.taskbar;



import static com.android.app.animation.Interpolators.EMPHASIZED;

import static com.android.launcher3.taskbar.TaskbarKeyguardController.MASK_ANY_SYSUI_LOCKED;

import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_APP;

import static com.android.launcher3.taskbar.TaskbarStashController.FLAG_IN_STASHED_LAUNCHER_STATE;

import static com.android.launcher3.taskbar.TaskbarViewController.ALPHA_INDEX_HOME;

import static com.android.launcher3.util.FlagDebugUtils.appendFlag;

import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange;

import static com.android.systemui.animation.Interpolators.EMPHASIZED;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_AWAKE;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_DEVICE_DREAMING;

import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_MASK;