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

Unverified Commit 31eb91c8 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17 

Android 14.0.0 Release 17 (UQ1A.231205.015)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPLwAKCRDorT+BmrEO
# eKxoAJ4on8ueNiPLOYTYsvA7GiUyet4+ygCgg0Ra8f/tZnwhMmy3PHF14rClycM=
# =In/R
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec  6 21:44:47 2023 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2182 signatures in the past
#      2 years.  Encrypted 4 messages in the past 23 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Stefan Andonian (4) and others
# Via Automerger Merge Worker (49) and others
* tag 'android-14.0.0_r17':
  Set FastBitmapDrawable's badge alpha when updating drawable alpha.
  Scale Launcher icons on hover.
  Update version numbers for dependencies
  Add most important Interpolators as resource interpolators to AnimationLib
  Clean up gradle setup of AnimationLibrary
  Revert "Revert "Used ElapsedRealtimeNanos instead of Choreographer times...""
  Revert "Revert "Add Winscope Magic Number to ViewCapture data output.""
  Revert "Add Winscope Magic Number to ViewCapture data output."
  Revert "Used ElapsedRealtimeNanos instead of Choreographer times..."
  Used ElapsedRealtimeNanos instead of Choreographer timestamp.
  Add Winscope Magic Number to ViewCapture data output.
  Adding a method for getting ExportedData from ViewCapture
  Migrate Interpolators from Launcher3 to the public animation library

Change-Id: I73e51c3416a5f8bd0e9b32d1d9191cf9b3e19bdf
parents dd66f357 c790f708

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