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

Commit 1b85d8bf authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q3 (ab/11976889) to aosp-main-future 

Bug: 347831320
Merged-In: I8b8e52aba12a1c7d048a9b9d4dd2a556f6788eba
Change-Id: I4e3fc65e4b03033b7dc781d128ea3ae9174c6233
parents 051293d3 5e723652

Android.bp

0 → 100644
+20 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2024 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.

//



// TODO(b/332914405): TEST_MAPPING files do not support soong_namespace

// Temporarily disable the namespace for now

//soong_namespace {

//}

PREUPLOAD.cfg

+5 −2
Original line number Diff line number Diff line 
[Builtin Hooks]

bpfmt = true

ktfmt = true



[Builtin Hooks Options]

bpfmt = -d

ktfmt = --kotlinlang-style



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/libs/systemui/ktfmt_includes.txt ${PREUPLOAD_FILES}



ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PREUPLOAD_FILES}



[Tool Paths]

ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar

aconfig/systemui.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -31,3 +31,13 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "bouncer_area_exclusion"

    namespace : "systemui"

    description : "Exclusion List to calculated a default bouncer region on dream"

    bug : "327003425"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

animationlib/src/com/android/app/animation/Interpolators.java

+9 −2
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ public class Interpolators { 


    public static final Interpolator DECELERATED_EASE = new PathInterpolator(0, 0, .2f, 1f);

    public static final Interpolator ACCELERATED_EASE = new PathInterpolator(0.4f, 0, 1f, 1f);

    public static final Interpolator PREDICTIVE_BACK_DECELERATED_EASE =

            new PathInterpolator(0, 0, 0, 1f);

    public static final Interpolator ALPHA_IN = new PathInterpolator(0.4f, 0f, 1f, 1f);

    public static final Interpolator ALPHA_OUT = new PathInterpolator(0f, 0f, 0.8f, 1f);

    public static final Interpolator ACCELERATE = new AccelerateInterpolator();
@@ -258,6 +256,15 @@ public class Interpolators { 
        }

    };



    /**

     * Use this interpolator for animating progress values coming from the back callback to get

     * the predictive-back-typical decelerate motion.

     *

     * This interpolator is similar to {@link Interpolators#STANDARD_DECELERATE} but has a slight

     * acceleration phase at the start.

     */

    public static final Interpolator BACK_GESTURE = new PathInterpolator(0.1f, 0.1f, 0f, 1f);



    private static final float FAST_FLING_PX_MS = 10;



    /*

animationlib/src/com/android/app/animation/InterpolatorsAndroidX.java

+9 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ public class InterpolatorsAndroidX { 


    public static final Interpolator DECELERATED_EASE = new PathInterpolator(0, 0, .2f, 1f);

    public static final Interpolator ACCELERATED_EASE = new PathInterpolator(0.4f, 0, 1f, 1f);

    public static final Interpolator PREDICTIVE_BACK_DECELERATED_EASE =

            new PathInterpolator(0, 0, 0, 1f);

    public static final Interpolator ALPHA_IN = new PathInterpolator(0.4f, 0f, 1f, 1f);

    public static final Interpolator ALPHA_OUT = new PathInterpolator(0f, 0f, 0.8f, 1f);

    public static final Interpolator ACCELERATE = new AccelerateInterpolator();
@@ -264,6 +262,15 @@ public class InterpolatorsAndroidX { 
        }

    };



    /**

     * Use this interpolator for animating progress values coming from the back callback to get

     * the predictive-back-typical decelerate motion.

     *

     * This interpolator is similar to {@link Interpolators#STANDARD_DECELERATE} but has a slight

     * acceleration phase at the start.

     */

    public static final Interpolator BACK_GESTURE = new PathInterpolator(0.1f, 0.1f, 0f, 1f);



    private static final float FAST_FLING_PX_MS = 10;



    /*