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

Commit 48810913 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 QPR1 

Merged-In: I4762502d8982a4fb1cc143f8c332010b5afe6e96
Bug: 315507370
Change-Id: I12455b9a319d7162ead5edab61433f62314cab05
parents 65bef666 30a2b10b

animationlib/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ android_library { 
        "src/**/*.java",

        "src/**/*.kt"

    ],

    resource_dirs: [

        "res"

    ],

    kotlincflags: ["-Xjvm-default=all"],

    // This library is meant to access only public APIs

    // do not flip this flag to true

animationlib/build.gradle

+3 −1
Original line number Diff line number Diff line
@@ -11,10 +11,12 @@ android { 
    sourceSets {

        main {

            java.srcDirs = ['src']

            res.srcDirs = ['res']

            manifest.srcFile 'AndroidManifest.xml'

        }

        androidTest {

            java.srcDirs = ["tests"]

            java.srcDirs = ["tests/src"]

            manifest.srcFile 'tests/AndroidManifest.xml'

        }

    }

    compileSdk 33

animationlib/res/interpolator/emphasized_accelerate_interpolator.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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:controlX1="0.3"

    android:controlY1="0"

    android:controlX2="0.8"

    android:controlY2="0.15"/>

animationlib/res/interpolator/emphasized_decelerate_interpolator.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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:controlX1="0.05"

    android:controlY1="0.7"

    android:controlX2="0.1"

    android:controlY2="1"/>

animationlib/res/interpolator/emphasized_interpolator.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 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"/>
 
 No newline at end of file