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

Commit ddb03a45 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Wrap the lottie views and trace whenever it invalidates" into udc-dev

parents 7b715ed9 5e56874d

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
@@ -59,7 +59,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"
@@ -67,7 +67,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"