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

Commit b070dcf5 authored by Joel Galenson's avatar Joel Galenson Committed by android-build-merger
Browse files

Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev

am: 5bac48f7

Change-Id: Ief691feb48e7e2e8b471d00c5caaf73f9a023365
parents 0b4dea98 5bac48f7
Loading
Loading
Loading
Loading
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->

<!-- Copy of progress_indeterminate_horizontal_rect1 in frameworks/base/core/res -->
<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_copy"
        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_copy"
        android:repeatCount="infinite" />
</set>
+31 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->

<!-- Copy of progress_indeterminate_horizontal_rect2 in frameworks/base/core/res -->
<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_copy"
        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_copy"
        android:repeatCount="infinite" />
</set>
+3 −5
Original line number Diff line number Diff line
@@ -14,15 +14,13 @@
     limitations under the License.
-->

<!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which
     draws the whole height of the progress bar instead having blank space above and below the
     bar. -->
<!-- Copy of progress_indeterminate_horizontal_material_trimmed in frameworks/base/core/res -->
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
                 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_copy" />
    <target
        android:name="rect1_grp"
        android:animation="@*android:anim/progress_indeterminate_horizontal_rect1" />
        android:animation="@anim/progress_indeterminate_horizontal_rect1_copy" />
</animated-vector>
 No newline at end of file
+18 −0
Original line number Diff line number Diff line
<!-- Copyright (C) 2014 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.
-->

<!-- Copy of progress_indeterminate_horizontal_rect1_scalex in frameworks/base/core/res -->
<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" />
+19 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->

<!-- Copy of progress_indeterminate_horizontal_rect1_translatex in frameworks/base/core/res -->
<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