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

Commit 0c6eb6c3 authored by Bill Lin's avatar Bill Lin Committed by android-build-merger
Browse files

Merge "Do not access framework private anim resource" into qt-dev am: e678b838 am: 10c917c1

am: 2a1c4b28

Change-Id: I7558265f1cddfe8cc9828ea662dc5116368a112f
parents 4648ceb7 2a1c4b28
Loading
Loading
Loading
Loading
+30 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" >
    <objectAnimator
        android:duration="2000"
        android:propertyXName="translateX"
        android:pathData="M -522.59998,0 c 48.89972,0 166.02656,0 301.21729,0 c 197.58128,0 420.9827,0 420.9827,0 "
        android:interpolator="@interpolator/progress_indeterminate_horizontal_rect1_translatex"
        android:repeatCount="infinite" />
    <objectAnimator
        android:duration="2000"
        android:propertyYName="scaleX"
        android:pathData="M 0 0.1 L 1 0.826849212646 L 2 0.1"
        android:interpolator="@interpolator/progress_indeterminate_horizontal_rect1_scalex"
        android:repeatCount="infinite" />
</set>
+30 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<set xmlns:android="http://schemas.android.com/apk/res/android" >
    <objectAnimator
        android:duration="2000"
        android:propertyXName="translateX"
        android:pathData="M -197.60001,0 c 14.28182,0 85.07782,0 135.54689,0 c 54.26191,0 90.42461,0 168.24331,0 c 144.72154,0 316.40982,0 316.40982,0 "
        android:interpolator="@interpolator/progress_indeterminate_horizontal_rect2_translatex"
        android:repeatCount="infinite" />
    <objectAnimator
        android:duration="2000"
        android:propertyYName="scaleX"
        android:pathData="M 0.0,0.1 L 1.0,0.571379510698 L 2.0,0.909950256348 L 3.0,0.1"
        android:interpolator="@interpolator/progress_indeterminate_horizontal_rect2_scalex"
        android:repeatCount="infinite" />
</set>
+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@
    android:drawable="@drawable/vector_drawable_progress_indeterminate_horizontal_trimmed" >
    <target
        android:name="rect2_grp"
        android:animation="@*android:anim/progress_indeterminate_horizontal_rect2" />
        android:animation="@anim/progress_indeterminate_horizontal_rect2" />
    <target
        android:name="rect1_grp"
        android:animation="@*android:anim/progress_indeterminate_horizontal_rect1" />
        android:animation="@anim/progress_indeterminate_horizontal_rect1" />
</animated-vector>
+17 −0
Original line number Diff line number Diff line
<!-- Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
    android:pathData="M 0 0 L 0.3665 0 C 0.47252618112021,0.062409910275 0.61541608570164,0.5 0.68325,0.5 C 0.75475061236836,0.5 0.75725829093844,0.814510098964 1.0,1.0" />
+18 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at

          http://www.apache.org/licenses/LICENSE-2.0

     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-->

<pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
    android:pathData="M 0.0,0.0 L 0.2 0 C 0.3958333333336,0.0 0.474845090492,0.206797621729 0.5916666666664,0.417082932942 C 0.7151610251224,0.639379624869 0.81625,0.974556908664 1.0,1.0 " />
Loading