diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/AccountPreference.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/accounts/AccountSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/widget/ChartSweepView.java | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java index 64685c0..7547721 100644 --- a/src/com/android/settings/AccountPreference.java +++ b/src/com/android/settings/AccountPreference.java @@ -114,8 +114,7 @@ public class AccountPreference extends Preference { int res; switch (status) { case SYNC_ENABLED: - case SYNC_IN_PROGRESS: - res = R.drawable.ic_settings_sync; + res = R.drawable.ic_sync_green_holo; break; case SYNC_DISABLED: res = R.drawable.ic_sync_grey_holo; @@ -123,6 +122,9 @@ public class AccountPreference extends Preference { case SYNC_ERROR: res = R.drawable.ic_sync_red_holo; break; + case SYNC_IN_PROGRESS: + res = R.drawable.ic_sync_green_holo; + break; default: res = R.drawable.ic_sync_red_holo; Log.e(TAG, "Unknown sync status: " + status); diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java index c010a7b..ffada53 100644 --- a/src/com/android/settings/accounts/AccountSettings.java +++ b/src/com/android/settings/accounts/AccountSettings.java @@ -296,7 +296,7 @@ public class AccountSettings extends SettingsPreferenceFragment private Preference newAddAccountPreference(Context context) { Preference preference = new Preference(context); preference.setTitle(R.string.add_account_label); - preference.setIcon(R.drawable.ic_menu_add); + preference.setIcon(R.drawable.ic_menu_add_dark); preference.setOnPreferenceClickListener(this); preference.setOrder(ORDER_NEXT_TO_LAST); return preference; diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java index e8e24aa..04fc862 100644 --- a/src/com/android/settings/widget/ChartSweepView.java +++ b/src/com/android/settings/widget/ChartSweepView.java @@ -123,15 +123,14 @@ public class ChartSweepView extends View { final TypedArray a = context.obtainStyledAttributes( attrs, R.styleable.ChartSweepView, defStyle, 0); - final int color = a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE); - setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable), color); + setSweepDrawable(a.getDrawable(R.styleable.ChartSweepView_sweepDrawable)); setFollowAxis(a.getInt(R.styleable.ChartSweepView_followAxis, -1)); setNeighborMargin(a.getDimensionPixelSize(R.styleable.ChartSweepView_neighborMargin, 0)); setSafeRegion(a.getDimensionPixelSize(R.styleable.ChartSweepView_safeRegion, 0)); setLabelMinSize(a.getDimensionPixelSize(R.styleable.ChartSweepView_labelSize, 0)); setLabelTemplate(a.getResourceId(R.styleable.ChartSweepView_labelTemplate, 0)); - setLabelColor(color); + setLabelColor(a.getColor(R.styleable.ChartSweepView_labelColor, Color.BLUE)); // TODO: moved focused state directly into assets setBackgroundResource(R.drawable.data_usage_sweep_background); @@ -214,7 +213,7 @@ public class ChartSweepView extends View { requestLayout(); } - public void setSweepDrawable(Drawable sweep, int color) { + public void setSweepDrawable(Drawable sweep) { if (mSweep != null) { mSweep.setCallback(null); unscheduleDrawable(mSweep); @@ -227,8 +226,6 @@ public class ChartSweepView extends View { } sweep.setVisible(getVisibility() == VISIBLE, false); mSweep = sweep; - // Match the text. - mSweep.setTint(color); sweep.getPadding(mSweepPadding); } else { mSweep = null; |