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

Commit 19721d5e authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Extract Launcher resource interpolators to Animation Library" into udc-qpr-dev

parents fd35baa3 a82eebd2
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ android_library {
        "androidx.cardview_cardview",
        "com.google.android.material_material",
        "iconloader_base",
        "view_capture"
        "view_capture",
        "animationlib"
    ],
    manifest: "AndroidManifest-common.xml",
    sdk_version: "current",
+0 −21
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2021, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
**     http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
    android:pathData="M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1"/>
+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener

        mOpeningXInterpolator = AnimationUtils.loadInterpolator(context, R.interpolator.app_open_x);
        mOpeningInterpolator = AnimationUtils.loadInterpolator(context,
                R.interpolator.three_point_fast_out_extra_slow_in);
                R.interpolator.emphasized_interpolator);
    }

    @Override
+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ public class LauncherBackAnimationController {
        mWindowMaxDeltaY = mLauncher.getResources().getDimensionPixelSize(
                R.dimen.swipe_back_window_max_delta_y);
        mCancelInterpolator =
                AnimationUtils.loadInterpolator(mLauncher, R.interpolator.back_cancel);
                AnimationUtils.loadInterpolator(mLauncher, R.interpolator.standard_interpolator);
    }

    /**
+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@
        android:fillEnabled="true"
        android:fillBefore="true"
        android:fillAfter="true"
        android:interpolator="@interpolator/standard_decelerate"
        android:interpolator="@interpolator/standard_decelerate_interpolator"
        android:startOffset="100"
        android:duration="350" />

@@ -35,7 +35,7 @@
        android:fillEnabled="true"
        android:fillBefore="true"
        android:fillAfter="true"
        android:interpolator="@interpolator/fast_out_extra_slow_in"
        android:interpolator="@interpolator/emphasized_interpolator"
        android:startOffset="0"
        android:duration="450" />

Loading