Sync asset drop and smoother animation.

Bug: 5233703
Change-Id: I3fa52da71b78dcfa7842047b427c5121d3ac7e68

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%" />

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"

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>

res/layout/preference_widget_sync_toggle.xml

@@ -23,34 +23,23 @@
     android:gravity="center_vertical|right">
 
     <ImageView
-        android:id="@+android:id/sync_failed"
+        android:id="@+id/sync_failed"
-        android:src="@drawable/ic_list_syncerror"
+        android:src="@drawable/ic_sync_error_holo"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6sp"
+        android:layout_marginRight="8dip"
-        android:layout_marginBottom="2sp"
         android:layout_height="wrap_content" />
 
-    <ImageView
+    <com.android.settings.widget.AnimatedImageView
-        android:id="@+android:id/sync_active"
+        android:id="@+id/sync_active"
         android:src="@drawable/ic_list_sync_anim"
         android:layout_width="wrap_content"
-        android:layout_marginLeft="6sp"
+        android:layout_height="wrap_content"
-        android:layout_marginBottom="2sp"
+        android:layout_marginRight="8dip" />
-        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" />
 
     <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" />

src/com/android/settings/AccountPreference.java

@@ -112,16 +112,16 @@ public class AccountPreference extends Preference {
         int res;
         switch (status) {
             case SYNC_ENABLED:
-                res = R.drawable.ic_sync_green;
+                res = R.drawable.ic_sync_green_holo;
                 break;
             case SYNC_DISABLED:
-                res = R.drawable.ic_sync_grey;
+                res = R.drawable.ic_sync_grey_holo;
                 break;
             case SYNC_ERROR:
-                res = R.drawable.ic_sync_red;
+                res = R.drawable.ic_sync_red_holo;
                 break;
             default:
-                res = R.drawable.ic_sync_red;
+                res = R.drawable.ic_sync_red_holo;
                 Log.e(TAG, "Unknown sync status: " + status);
         }
         return res;

src/com/android/settings/accounts/AccountSyncSettings.java

@@ -158,8 +158,6 @@ public class AccountSyncSettings extends AccountPreferenceBase {
 
         mErrorInfoView = (TextView) rootView.findViewById(R.id.sync_settings_error_info);
         mErrorInfoView.setVisibility(View.GONE);
-        mErrorInfoView.setCompoundDrawablesWithIntrinsicBounds(
-                getResources().getDrawable(R.drawable.ic_list_syncerror), null, null, null);
 
         mUserId = (TextView) rootView.findViewById(R.id.user_id);
         mProviderId = (TextView) rootView.findViewById(R.id.provider_id);

src/com/android/settings/accounts/ManageAccountsSettings.java

@@ -110,9 +110,6 @@ public class ManageAccountsSettings extends AccountPreferenceBase
 
         mErrorInfoView = (TextView)view.findViewById(R.id.sync_settings_error_info);
         mErrorInfoView.setVisibility(View.GONE);
-        mErrorInfoView.setCompoundDrawablesWithIntrinsicBounds(
-                activity.getResources().getDrawable(R.drawable.ic_list_syncerror),
-                null, null, null);
 
         mAutoSyncCheckbox = (CheckBoxPreference) findPreference(AUTO_SYNC_CHECKBOX_KEY);
 

src/com/android/settings/accounts/SyncStateCheckBoxPreference.java

@@ -16,17 +16,15 @@
 
 package com.android.settings.accounts;
 
-import com.android.settings.R;
+import android.accounts.Account;
-
 import android.content.Context;
-import android.graphics.drawable.AnimationDrawable;
-import android.os.Handler;
 import android.preference.CheckBoxPreference;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
-import android.accounts.Account;
+
+import com.android.settings.R;
+import com.android.settings.widget.AnimatedImageView;
 
 public class SyncStateCheckBoxPreference extends CheckBoxPreference {
 
@@ -59,35 +57,16 @@ public class SyncStateCheckBoxPreference extends CheckBoxPreference {
     @Override
     public void onBindView(View view) {
         super.onBindView(view);
-        ImageView syncActiveView = (ImageView) view.findViewById(R.id.sync_active);
+        final AnimatedImageView syncActiveView = (AnimatedImageView) view.findViewById(
-        View syncPendingView = view.findViewById(R.id.sync_pending);
+                R.id.sync_active);
-        View syncFailedView = view.findViewById(R.id.sync_failed);
+        final View syncFailedView = view.findViewById(R.id.sync_failed);
 
-        syncActiveView.setVisibility(mIsActive ? View.VISIBLE : View.GONE);
+        final boolean activeVisible = mIsActive || mIsPending;
-        final AnimationDrawable anim = (AnimationDrawable) syncActiveView.getDrawable();
+        syncActiveView.setVisibility(activeVisible ? View.VISIBLE : View.GONE);
-        boolean showError;
+        syncActiveView.setAnimating(mIsActive);
-        boolean showPending;
-        if (mIsActive) {
-            new Handler(getContext().getMainLooper()).post(new Runnable() {
-                public void run() {
-                    anim.start();
-                }
-            });
-            showPending = false;
-            showError = false;
-        } else {
-            anim.stop();
-            if (mIsPending) {
-                showPending = true;
-                showError = false;
-            } else {
-                showPending = false;
-                showError = mFailed;
-            }
-        }
 
-        syncFailedView.setVisibility(showError ? View.VISIBLE : View.GONE);
+        final boolean failedVisible = mFailed && !activeVisible;
-        syncPendingView.setVisibility((showPending && !mIsActive) ? View.VISIBLE : View.GONE);
+        syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);
 
         View checkBox = view.findViewById(android.R.id.checkbox);
         if (mOneTimeSyncMode) {

src/com/android/settings/widget/AnimatedImageView.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.graphics.drawable.AnimatedRotateDrawable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+public class AnimatedImageView extends ImageView {
+    private AnimatedRotateDrawable mDrawable;
+    private boolean mAnimating;
+
+    public AnimatedImageView(Context context) {
+        super(context);
+    }
+
+    public AnimatedImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    private void updateDrawable() {
+        if (isShown() && mDrawable != null) {
+            mDrawable.stop();
+        }
+        final Drawable drawable = getDrawable();
+        if (drawable instanceof AnimatedRotateDrawable) {
+            mDrawable = (AnimatedRotateDrawable) drawable;
+            // TODO: define in drawable xml once we have public attrs.
+            mDrawable.setFramesCount(56);
+            mDrawable.setFramesDuration(32);
+            if (isShown() && mAnimating) {
+                mDrawable.start();
+            }
+        } else {
+            mDrawable = null;
+        }
+    }
+
+    private void updateAnimating() {
+        if (mDrawable != null) {
+            if (isShown() && mAnimating) {
+                mDrawable.start();
+            } else {
+                mDrawable.stop();
+            }
+        }
+    }
+
+    @Override
+    public void setImageDrawable(Drawable drawable) {
+        super.setImageDrawable(drawable);
+        updateDrawable();
+    }
+
+    @Override
+    public void setImageResource(int resid) {
+        super.setImageResource(resid);
+        updateDrawable();
+    }
+
+    @Override
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        updateAnimating();
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        updateAnimating();
+    }
+
+    public void setAnimating(boolean animating) {
+        mAnimating = animating;
+        updateAnimating();
+    }
+
+    @Override
+    protected void onVisibilityChanged(View changedView, int vis) {
+        super.onVisibilityChanged(changedView, vis);
+        updateAnimating();
+    }
+}