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

Commit ec7f4821 authored by PETER LIANG's avatar PETER LIANG Committed by Automerger Merge Worker
Browse files

Merge changes from topic "a11y_image_preference_bc" into sc-dev am: a96c844d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928754

Change-Id: If20ac2d389642d8de204c1b9e709b027bc22b3be
parents 64d5b556 a96c844d
Loading
Loading
Loading
Loading
−692 KiB
Loading image diff...
−1.65 MiB
Loading image diff...
+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
+2888 −0

File added.

Preview size limit exceeded, changes collapsed.

+5729 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading