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

Commit e24345fc authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "New unlock animations" into qt-r1-dev

am: ce25bd2f

Change-Id: Ia791f26968612f8970a8cfedbd765e5a734f50d2
parents f3be8361 ce25bd2f
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@
                    </aapt:attr>
                </objectAnimator>
                <objectAnimator
                    android:duration="333"
                    android:duration="183"
                    android:propertyName="pathData"
                    android:startOffset="67"
                    android:valueFrom="M14.33 14.33 C14.33,14.33 14.29,6.17 14.29,6.17 C14.29,3.59 12.2,1.5 9.63,1.5 C7.05,1.5 4.96,3.59 4.96,6.17 C4.96,6.17 4.96,7.33 4.96,7.33 "
@@ -286,7 +286,7 @@
        <aapt:attr name="android:animation">
            <set android:ordering="together">
                <objectAnimator
                    android:duration="717"
                    android:duration="983"
                    android:propertyName="translateX"
                    android:startOffset="0"
                    android:valueFrom="0"
+151 −237

File changed.

Preview size limit exceeded, changes collapsed.

+113 −159

File changed.

Preview size limit exceeded, changes collapsed.

+148 −231

File changed.

Preview size limit exceeded, changes collapsed.