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

am b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1

Browse Source 
* commit 'b08c11028776bab44e2b919edc3a7bbc8f9308e6':
  Kill the Switch on top-right after exiting Accounts & sync.
This commit is contained in:
Amith Yamasani
2011-11-15 13:29:01 -08:00
committed by Android Git Automerger
parent 0b49c3426a b08c110287
commit 7b43eab98b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,14 @@ public class ManageAccountsSettings extends AccountPreferenceBase
@Override
public void onStart() {
super.onStart();
AccountManager.get(getActivity()).addOnAccountsUpdatedListener(this, null, true);
Activity activity = getActivity();
AccountManager.get(activity).addOnAccountsUpdatedListener(this, null, true);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mAutoSyncSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.RIGHT));
}
@Override
@@ -100,12 +107,6 @@ public class ManageAccountsSettings extends AccountPreferenceBase
final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding);
mAutoSyncSwitch.setPadding(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mAutoSyncSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.RIGHT));
mAutoSyncSwitch.setChecked(ContentResolver.getMasterSyncAutomatically());
mAutoSyncSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
@@ -123,7 +124,10 @@ public class ManageAccountsSettings extends AccountPreferenceBase
@Override
public void onStop() {
super.onStop();
AccountManager.get(getActivity()).removeOnAccountsUpdatedListener(this);
final Activity activity = getActivity();
AccountManager.get(activity).removeOnAccountsUpdatedListener(this);
activity.getActionBar().setDisplayOptions(0, ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(null);
}
@Override