From 262e252753bc0fde3e72095d5c041e95fd4daa58 Mon Sep 17 00:00:00 2001 From: ztenghui Date: Tue, 19 Aug 2014 14:35:53 -0700 Subject: Update indeterminate linear progress bar b/14622065 Change-Id: I1366ecd5e265f5acc31a0ec6281de6e345a8464b --- .../progress_indeterminate_horizontal_rect1.xml | 32 ++++++++++ ...ogress_indeterminate_horizontal_rect1_scale.xml | 45 -------------- ...ss_indeterminate_horizontal_rect1_translate.xml | 50 --------------- .../progress_indeterminate_horizontal_rect2.xml | 33 ++++++++++ ...ogress_indeterminate_horizontal_rect2_scale.xml | 56 ----------------- ...ss_indeterminate_horizontal_rect2_translate.xml | 56 ----------------- .../progress_indeterminate_horizontal_material.xml | 20 ++---- ..._drawable_progress_indeterminate_horizontal.xml | 71 +++++++++++----------- ...indeterminate_horizontal_rect1_grp_position.xml | 17 ++++++ ...ss_indeterminate_horizontal_rect1_grp_scale.xml | 17 ++++++ ...indeterminate_horizontal_rect2_grp_position.xml | 17 ++++++ ...ss_indeterminate_horizontal_rect2_grp_scale.xml | 17 ++++++ 12 files changed, 174 insertions(+), 257 deletions(-) create mode 100644 core/res/res/anim/progress_indeterminate_horizontal_rect1.xml delete mode 100644 core/res/res/anim/progress_indeterminate_horizontal_rect1_scale.xml delete mode 100644 core/res/res/anim/progress_indeterminate_horizontal_rect1_translate.xml create mode 100644 core/res/res/anim/progress_indeterminate_horizontal_rect2.xml delete mode 100644 core/res/res/anim/progress_indeterminate_horizontal_rect2_scale.xml delete mode 100644 core/res/res/anim/progress_indeterminate_horizontal_rect2_translate.xml create mode 100644 core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_position.xml create mode 100644 core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_scale.xml create mode 100644 core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_position.xml create mode 100644 core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_scale.xml diff --git a/core/res/res/anim/progress_indeterminate_horizontal_rect1.xml b/core/res/res/anim/progress_indeterminate_horizontal_rect1.xml new file mode 100644 index 000000000000..980c8e4647b0 --- /dev/null +++ b/core/res/res/anim/progress_indeterminate_horizontal_rect1.xml @@ -0,0 +1,32 @@ + + + + + + \ No newline at end of file diff --git a/core/res/res/anim/progress_indeterminate_horizontal_rect1_scale.xml b/core/res/res/anim/progress_indeterminate_horizontal_rect1_scale.xml deleted file mode 100644 index 7c782a67b8a0..000000000000 --- a/core/res/res/anim/progress_indeterminate_horizontal_rect1_scale.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core/res/res/anim/progress_indeterminate_horizontal_rect1_translate.xml b/core/res/res/anim/progress_indeterminate_horizontal_rect1_translate.xml deleted file mode 100644 index c26bb5d7bac4..000000000000 --- a/core/res/res/anim/progress_indeterminate_horizontal_rect1_translate.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core/res/res/anim/progress_indeterminate_horizontal_rect2.xml b/core/res/res/anim/progress_indeterminate_horizontal_rect2.xml new file mode 100644 index 000000000000..8f0b2e879be9 --- /dev/null +++ b/core/res/res/anim/progress_indeterminate_horizontal_rect2.xml @@ -0,0 +1,33 @@ + + + + + + + \ No newline at end of file diff --git a/core/res/res/anim/progress_indeterminate_horizontal_rect2_scale.xml b/core/res/res/anim/progress_indeterminate_horizontal_rect2_scale.xml deleted file mode 100644 index ef1677d01567..000000000000 --- a/core/res/res/anim/progress_indeterminate_horizontal_rect2_scale.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core/res/res/anim/progress_indeterminate_horizontal_rect2_translate.xml b/core/res/res/anim/progress_indeterminate_horizontal_rect2_translate.xml deleted file mode 100644 index f4cf83d605a7..000000000000 --- a/core/res/res/anim/progress_indeterminate_horizontal_rect2_translate.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/core/res/res/drawable/progress_indeterminate_horizontal_material.xml b/core/res/res/drawable/progress_indeterminate_horizontal_material.xml index 4fc68cead687..e92f090fe552 100644 --- a/core/res/res/drawable/progress_indeterminate_horizontal_material.xml +++ b/core/res/res/drawable/progress_indeterminate_horizontal_material.xml @@ -1,4 +1,3 @@ - + - - - - + android:name="rect2_grp" + android:animation="@anim/progress_indeterminate_horizontal_rect2" /> - + android:name="rect1_grp" + android:animation="@anim/progress_indeterminate_horizontal_rect1" /> + \ No newline at end of file diff --git a/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml b/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml index 0cc72027118a..7ceb7722c897 100644 --- a/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml +++ b/core/res/res/drawable/vector_drawable_progress_indeterminate_horizontal.xml @@ -13,48 +13,47 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - + android:name="v21" + android:translateX="180" + android:translateY="5" > + + + + + + + + + + + \ No newline at end of file diff --git a/core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_position.xml b/core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_position.xml new file mode 100644 index 000000000000..1e5490b27a2f --- /dev/null +++ b/core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_position.xml @@ -0,0 +1,17 @@ + + diff --git a/core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_scale.xml b/core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_scale.xml new file mode 100644 index 000000000000..dc0e48553959 --- /dev/null +++ b/core/res/res/interpolator/progress_indeterminate_horizontal_rect1_grp_scale.xml @@ -0,0 +1,17 @@ + + diff --git a/core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_position.xml b/core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_position.xml new file mode 100644 index 000000000000..e2c463db785b --- /dev/null +++ b/core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_position.xml @@ -0,0 +1,17 @@ + + diff --git a/core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_scale.xml b/core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_scale.xml new file mode 100644 index 000000000000..e19e3bd51933 --- /dev/null +++ b/core/res/res/interpolator/progress_indeterminate_horizontal_rect2_grp_scale.xml @@ -0,0 +1,17 @@ + + -- cgit v1.2.3-59-g8ed1b