Sync asset drop and smoother animation.

Bug: 5233703
Change-Id: I3fa52da71b78dcfa7842047b427c5121d3ac7e68

34 files changed, 20 insertions, 29 deletions

diff --git a/res/drawable-hdpi/ic_list_sync_anim0.png b/res/drawable-hdpi/ic_list_sync_anim0.png
deleted file mode 100755
index dc78905..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim0.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_list_sync_anim1.png b/res/drawable-hdpi/ic_list_sync_anim1.png
deleted file mode 100755
index 5fe6b4f..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim1.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_list_sync_anim2.png b/res/drawable-hdpi/ic_list_sync_anim2.png
deleted file mode 100755
index d9d68ed..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim2.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_list_sync_anim3.png b/res/drawable-hdpi/ic_list_sync_anim3.png
deleted file mode 100755
index 7275c29..0000000
--- a/res/drawable-hdpi/ic_list_sync_anim3.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_sync_anim_holo.png b/res/drawable-hdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..bc8dc58
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_anim_holo.png
diff --git a/res/drawable-hdpi/ic_sync_error.png b/res/drawable-hdpi/ic_sync_error.png
new file mode 100644
index 0000000..914d44d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_error.png
diff --git a/res/drawable-hdpi/ic_sync_error_holo.png b/res/drawable-hdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..3e34bd0
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_error_holo.png
diff --git a/res/drawable-hdpi/ic_sync_green_holo.png b/res/drawable-hdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..2588f3d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_green_holo.png
diff --git a/res/drawable-hdpi/ic_sync_grey_holo.png b/res/drawable-hdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..4c7060d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_grey_holo.png
diff --git a/res/drawable-hdpi/ic_sync_red_holo.png b/res/drawable-hdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..b65520d
--- /dev/null
+++ b/res/drawable-hdpi/ic_sync_red_holo.png
diff --git a/res/drawable-mdpi/ic_list_sync_anim0.png b/res/drawable-mdpi/ic_list_sync_anim0.png
deleted file mode 100644
index 981a72e..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim0.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_list_sync_anim1.png b/res/drawable-mdpi/ic_list_sync_anim1.png
deleted file mode 100644
index 4581ba2..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim1.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_list_sync_anim2.png b/res/drawable-mdpi/ic_list_sync_anim2.png
deleted file mode 100644
index b745916..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim2.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_list_sync_anim3.png b/res/drawable-mdpi/ic_list_sync_anim3.png
deleted file mode 100644
index 43e453d..0000000
--- a/res/drawable-mdpi/ic_list_sync_anim3.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_sync_anim_holo.png b/res/drawable-mdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..66db062
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_anim_holo.png
diff --git a/res/drawable-mdpi/ic_sync_error.png b/res/drawable-mdpi/ic_sync_error.png
new file mode 100644
index 0000000..2b98bca
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_error.png
diff --git a/res/drawable-mdpi/ic_sync_error_holo.png b/res/drawable-mdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..dd3958e
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_error_holo.png
diff --git a/res/drawable-mdpi/ic_sync_green_holo.png b/res/drawable-mdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..1c981b6
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_green_holo.png
diff --git a/res/drawable-mdpi/ic_sync_grey_holo.png b/res/drawable-mdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..bb4267f
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_grey_holo.png
diff --git a/res/drawable-mdpi/ic_sync_red_holo.png b/res/drawable-mdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..36fe6b8
--- /dev/null
+++ b/res/drawable-mdpi/ic_sync_red_holo.png
diff --git a/res/drawable-xhdpi/ic_list_sync_anim0.png b/res/drawable-xhdpi/ic_list_sync_anim0.png
deleted file mode 100644
index 9909f6a..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim0.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_list_sync_anim1.png b/res/drawable-xhdpi/ic_list_sync_anim1.png
deleted file mode 100644
index f751f2a..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim1.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_list_sync_anim2.png b/res/drawable-xhdpi/ic_list_sync_anim2.png
deleted file mode 100644
index 374db6a..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim2.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_list_sync_anim3.png b/res/drawable-xhdpi/ic_list_sync_anim3.png
deleted file mode 100644
index ec3fde6..0000000
--- a/res/drawable-xhdpi/ic_list_sync_anim3.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_sync_anim_holo.png b/res/drawable-xhdpi/ic_sync_anim_holo.png
new file mode 100644
index 0000000..d315e95
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_anim_holo.png
diff --git a/res/drawable-xhdpi/ic_sync_error.png b/res/drawable-xhdpi/ic_sync_error.png
new file mode 100644
index 0000000..b9a5357
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_error.png
diff --git a/res/drawable-xhdpi/ic_sync_error_holo.png b/res/drawable-xhdpi/ic_sync_error_holo.png
new file mode 100644
index 0000000..85f19bf
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_error_holo.png
diff --git a/res/drawable-xhdpi/ic_sync_green_holo.png b/res/drawable-xhdpi/ic_sync_green_holo.png
new file mode 100644
index 0000000..95e2d7d
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_green_holo.png
diff --git a/res/drawable-xhdpi/ic_sync_grey_holo.png b/res/drawable-xhdpi/ic_sync_grey_holo.png
new file mode 100644
index 0000000..10cc48a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_grey_holo.png
diff --git a/res/drawable-xhdpi/ic_sync_red_holo.png b/res/drawable-xhdpi/ic_sync_red_holo.png
new file mode 100644
index 0000000..c4b9136
--- /dev/null
+++ b/res/drawable-xhdpi/ic_sync_red_holo.png
diff --git a/res/drawable/ic_list_sync_anim.xml b/res/drawable/ic_list_sync_anim.xml
index b6965c5..e70c300 100644
--- a/res/drawable/ic_list_sync_anim.xml
+++ b/res/drawable/ic_list_sync_anim.xml
@@ -17,12 +17,8 @@
 ** limitations under the License.
 */
 -->
-<animation-list
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:oneshot="false">
-    <item android:drawable="@drawable/ic_list_sync_anim0" android:duration="150" />
-    <item android:drawable="@drawable/ic_list_sync_anim1" android:duration="150" />
-    <item android:drawable="@drawable/ic_list_sync_anim2" android:duration="150" />
-    <item android:drawable="@drawable/ic_list_sync_anim3" android:duration="150" />
-</animation-list>
 
+<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_sync_anim_holo"
+    android:pivotX="50%"
+    android:pivotY="50%" />
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 5a4bc59..d54d750 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -37,7 +37,10 @@
     <TextView android:id="@+id/sync_settings_error_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sync_is_failing" />
+        android:layout_margin="8dip"
+        android:text="@string/sync_is_failing"
+        android:drawablePadding="8dip"
+        android:drawableLeft="@drawable/ic_sync_error_holo" />
 
     <!--
     <LinearLayout android:id="@+id/remove_account_area"
diff --git a/res/layout/manage_accounts_screen.xml b/res/layout/manage_accounts_screen.xml
index ce86920..2717805 100644
--- a/res/layout/manage_accounts_screen.xml
+++ b/res/layout/manage_accounts_screen.xml
@@ -34,6 +34,9 @@
     <TextView android:id="@+id/sync_settings_error_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sync_is_failing" />
+        android:layout_margin="8dip"
+        android:text="@string/sync_is_failing"
+        android:drawablePadding="8dip"
+        android:drawableLeft="@drawable/ic_sync_error_holo" />
 
 </LinearLayout>
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 6eaa86e..5057aab 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -23,34 +23,23 @@
     android:gravity="center_vertical|right">
 
     <ImageView
-        android:id="@+android:id/sync_failed"
-        android:src="@drawable/ic_list_syncerror"
+        android:id="@+id/sync_failed"
+        android:src="@drawable/ic_sync_error_holo"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6sp"
-        android:layout_marginBottom="2sp"
+        android:layout_marginRight="8dip"
         android:layout_height="wrap_content" />
 
-    <ImageView
-        android:id="@+android:id/sync_active"
+    <com.android.settings.widget.AnimatedImageView
+        android:id="@+id/sync_active"
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6sp"
-        android:layout_marginBottom="2sp"
-        android:layout_height="wrap_content" />
-
-    <ImageView
-        android:id="@+android:id/sync_pending"
-        android:src="@drawable/ic_list_sync_anim0"
-        android:layout_width="wrap_content"
-        android:layout_marginLeft="6sp"
-        android:layout_marginBottom="2sp"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginRight="8dip" />
 
     <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+android:id/checkbox"
+        android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="4sp"
         android:layout_gravity="center_vertical"
         android:focusable="false"
         android:clickable="false" />