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

Commit 533a9323 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Wrap the lottie views and trace whenever it invalidates" into udc-qpr-dev am: 08589dd5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24023554



Change-Id: I141616b0ad073385d11a57d22258fdac3ac4b4a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0638ffa 08589dd5

packages/SystemUI/res/layout/activity_rear_display_education.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        app:cardCornerRadius="28dp"

        app:cardBackgroundColor="@color/rear_display_overlay_animation_background_color">



            <com.airbnb.lottie.LottieAnimationView

            <com.android.systemui.reardisplay.RearDisplayEducationLottieViewWrapper

                android:id="@+id/rear_display_folded_animation"

                android:importantForAccessibility="no"

                android:layout_width="@dimen/rear_display_animation_width"

packages/SystemUI/res/layout/activity_rear_display_education_opened.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        app:cardCornerRadius="28dp"

        app:cardBackgroundColor="@color/rear_display_overlay_animation_background_color">



        <com.airbnb.lottie.LottieAnimationView

        <com.android.systemui.reardisplay.RearDisplayEducationLottieViewWrapper

            android:id="@+id/rear_display_folded_animation"

            android:importantForAccessibility="no"

            android:layout_width="@dimen/rear_display_animation_width_opened"

packages/SystemUI/res/layout/auth_biometric_contents.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


        <include layout="@layout/auth_biometric_icon"/>



        <com.airbnb.lottie.LottieAnimationView

        <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

            android:id="@+id/biometric_icon_overlay"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

packages/SystemUI/res/layout/biometric_prompt_layout.xml

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
        android:layout_height="wrap_content"

        android:layout_gravity="center">



        <com.airbnb.lottie.LottieAnimationView

        <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

            android:id="@+id/biometric_icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -68,7 +68,7 @@ 
            android:contentDescription="@null"

            android:scaleType="fitXY" />



        <com.airbnb.lottie.LottieAnimationView

        <com.android.systemui.biometrics.BiometricPromptLottieViewWrapper

            android:id="@+id/biometric_icon_overlay"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

packages/SystemUI/res/layout/sidefps_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.airbnb.lottie.LottieAnimationView

<com.android.systemui.biometrics.SideFpsLottieViewWrapper

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/sidefps_animation"