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

Commit a96c844d authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

Merge changes from topic "a11y_image_preference_bc" into sc-dev 

* changes:
  Update the Lottie images for Accessibility features.
  Update the material next style for AnimatedImagePreference.
parents cd6c64a5 3e06c2e5

res/drawable/accessibility_color_inversion_banner.gif

deleted100644 → 0
−692 KiB
Loading image diff...

res/drawable/accessibility_magnification_banner.gif

deleted100644 → 0
−1.65 MiB
Loading image diff...

res/layout/preference_animated_image.xml

+13 −12
Original line number Diff line number Diff line
@@ -15,30 +15,31 @@ 
  limitations under the License.

  -->



<FrameLayout

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:clipToPadding="false"

    android:layout_height="@dimen/settingslib_illustration_height"

    android:gravity="center"

    android:padding="@dimen/settingslib_illustration_padding"

    android:orientation="vertical"

    android:importantForAccessibility="noHideDescendants">



    <ImageView

        android:id="@+id/animated_img"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:maxWidth="@dimen/settingslib_illustration_width"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:background="@drawable/protection_background"

        android:scaleType="fitCenter"

        android:focusable="false"

        android:clickable="false"

        android:adjustViewBounds="true"/>



    <com.airbnb.lottie.LottieAnimationView

        android:id="@+id/lottie_view"

        android:layout_width="412dp"

        android:layout_height="300dp"

        android:layout_gravity="center"

        android:maxWidth="@dimen/settingslib_illustration_width"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:background="@drawable/protection_background"

        android:scaleType="fitCenter"

        android:adjustViewBounds="true"

        android:clipToOutline="true"/>

</FrameLayout>
 
 No newline at end of file
 
</LinearLayout>
 
 No newline at end of file