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

Merge "Use SwitchBar for Daydream Settings - a better way"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-05-15 22:25:33 +00:00
committed by Android (Google) Code Review
parent 7334cc84b6 c2e2f77739
commit a7dc76f3ad
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/DreamSettings.java
View File

@@ -87,7 +87,6 @@ public class DreamSettings extends SettingsPreferenceFragment implements
mBackend = new DreamBackend(activity); mBackend = new DreamBackend(activity);
mSwitchBar = activity.getSwitchBar(); mSwitchBar = activity.getSwitchBar();
mSwitchBar.addOnSwitchChangeListener(this);
mSwitch = mSwitchBar.getSwitch(); mSwitch = mSwitchBar.getSwitch();
setHasOptionsMenu(true); setHasOptionsMenu(true);
@@ -111,8 +110,6 @@ public class DreamSettings extends SettingsPreferenceFragment implements
@Override @Override
public void onDestroyView() { public void onDestroyView() {
logd("onDestroyView()"); logd("onDestroyView()");
mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBar.hide();
super.onDestroyView(); super.onDestroyView();
} }
@@ -130,8 +127,6 @@ public class DreamSettings extends SettingsPreferenceFragment implements
mAdapter = new DreamInfoAdapter(mContext); mAdapter = new DreamInfoAdapter(mContext);
listView.setAdapter(mAdapter); listView.setAdapter(mAdapter);
mSwitchBar.show();
} }
@Override @Override
@@ -217,7 +212,11 @@ public class DreamSettings extends SettingsPreferenceFragment implements
public void onPause() { public void onPause() {
logd("onPause()"); logd("onPause()");
super.onPause(); super.onPause();
mContext.unregisterReceiver(mPackageReceiver); mContext.unregisterReceiver(mPackageReceiver);
mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBar.hide();
} }
@Override @Override
@@ -234,6 +233,9 @@ public class DreamSettings extends SettingsPreferenceFragment implements
filter.addAction(Intent.ACTION_PACKAGE_REPLACED); filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
filter.addDataScheme(PACKAGE_SCHEME); filter.addDataScheme(PACKAGE_SCHEME);
mContext.registerReceiver(mPackageReceiver , filter); mContext.registerReceiver(mPackageReceiver , filter);
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBar.show();
} }
public static int getSummaryResource(Context context) { public static int getSummaryResource(Context context) {