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

resolved conflicts for merge of f9360dbc to master

Browse Source 
Change-Id: I2e468d83a7ce5200c59f63b4362e7bee10d0a2eb
This commit is contained in:
Fabrice Di Meglio
2014-06-12 15:46:41 -07:00
parent 524a63b493 f9360dbcef
commit 204521626f
13 changed files with 195 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/print/PrintServiceSettingsFragment.java
View File

@@ -143,16 +143,12 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
mSettingsContentObserver.register(getContentResolver());
updateEmptyView();
updateUiForServiceState();
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.show();
}
@Override
public void onPause() {
mSettingsContentObserver.unregister(getContentResolver());
super.onPause();
mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBar.hide();
}
@Override
@@ -168,6 +164,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
getActivity().getActionBar().setTitle(mOldActivityTitle);
}
super.onDestroyView();
mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBar.hide();
}
private void onPreferenceToggled(String preferenceKey, boolean enabled) {
@@ -292,6 +290,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
final SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.show();
mToggleSwitch = mSwitchBar.getSwitch();
mToggleSwitch.setOnBeforeCheckedChangeListener(new ToggleSwitch.OnBeforeCheckedChangeListener() {