PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync asset drop and smoother animation.

Browse Source 
Bug: 5233703
Change-Id: I3fa52da71b78dcfa7842047b427c5121d3ac7e68
This commit is contained in:
Jeff Sharkey
2011-08-30 19:59:36 -07:00
parent 9ca0ef5732
commit 7a7ea2bf2f
39 changed files with 136 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accounts/AccountSyncSettings.java
View File

@@ -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);

3
src/com/android/settings/accounts/ManageAccountsSettings.java
View File

@@ -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);

45
src/com/android/settings/accounts/SyncStateCheckBoxPreference.java
View File

@@ -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);
View syncPendingView = view.findViewById(R.id.sync_pending);
View syncFailedView = view.findViewById(R.id.sync_failed);
final AnimatedImageView syncActiveView = (AnimatedImageView) view.findViewById(
R.id.sync_active);
final View syncFailedView = view.findViewById(R.id.sync_failed);
syncActiveView.setVisibility(mIsActive ? View.VISIBLE : View.GONE);
final AnimationDrawable anim = (AnimationDrawable) syncActiveView.getDrawable();
boolean showError;
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;
}
}
final boolean activeVisible = mIsActive || mIsPending;
syncActiveView.setVisibility(activeVisible ? View.VISIBLE : View.GONE);
syncActiveView.setAnimating(mIsActive);
syncFailedView.setVisibility(showError ? View.VISIBLE : View.GONE);
syncPendingView.setVisibility((showPending && !mIsActive) ? View.VISIBLE : View.GONE);
final boolean failedVisible = mFailed && !activeVisible;
syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);
View checkBox = view.findViewById(android.R.id.checkbox);
if (mOneTimeSyncMode) {