diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:25 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-09 17:51:25 -0800 |
commit | 6e40ecff9f134ae9a4f13d0e3b74eb57a996dbac (patch) | |
tree | 0e1e6a83a4a9188e1187dc09bd6c01e0c39de2e9 | |
parent | f26f7146e8abc65a137c13d9d5113b3cfc3c09c4 (diff) | |
download | GoogleSubscribedFeedsProvider-6e40ecff9f134ae9a4f13d0e3b74eb57a996dbac.tar.gz |
auto import from //branches/cupcake/...@125939
-rw-r--r-- | res/drawable/ic_menu_refresh.png | bin | 2450 -> 0 bytes | |||
-rw-r--r-- | src/com/android/settings/SyncSettings.java | 11 |
2 files changed, 4 insertions, 7 deletions
diff --git a/res/drawable/ic_menu_refresh.png b/res/drawable/ic_menu_refresh.png Binary files differdeleted file mode 100644 index 77d70dd..0000000 --- a/res/drawable/ic_menu_refresh.png +++ /dev/null diff --git a/src/com/android/settings/SyncSettings.java b/src/com/android/settings/SyncSettings.java index 0043610..b7af99e 100644 --- a/src/com/android/settings/SyncSettings.java +++ b/src/com/android/settings/SyncSettings.java @@ -120,8 +120,6 @@ public class SyncSettings initProviders(); initUI(); - - broadcastBackgroundDataSettingChange(mSyncSettings.getBackgroundData()); } private void checkForAccount() { @@ -154,7 +152,7 @@ public class SyncSettings public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); menu.add(0, MENU_SYNC_NOW_ID, 0, getString(R.string.sync_menu_sync_now)) - .setIcon(R.drawable.ic_menu_refresh); + .setIcon(android.R.drawable.ic_menu_refresh); menu.add(0, MENU_SYNC_CANCEL_ID, 0, getString(R.string.sync_menu_sync_cancel)) .setIcon(android.R.drawable.ic_menu_close_clear_cancel); return true; @@ -257,11 +255,10 @@ public class SyncSettings } - private void broadcastBackgroundDataSettingChange(boolean setting) { + private void broadcastBackgroundDataSettingChange() { Intent intent = new Intent(); intent.setAction(BACKGROUND_DATA_SETTING_CHANGED); - intent.putExtra(BACKGROUND_DATA_INTENT_EXTRA_NAME, setting); - sendStickyBroadcast(intent); + sendBroadcast(intent); } public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) { @@ -347,7 +344,7 @@ public class SyncSettings private void setBackgroundDataInt(boolean enabled) { mSyncSettings.setBackgroundData(enabled); - broadcastBackgroundDataSettingChange(enabled); + broadcastBackgroundDataSettingChange(); } private void startSyncForEnabledProviders() { |