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

Fix bug #13880310 Toggle On/Off buttons disappear on hitting Search...

Browse Source 
... and back button in sub-settings

- move code managing the Switch from onCreate(...) to onStart()

Change-Id: I747180bea3880e84635134373bf4c681378f3ec8
This commit is contained in:
Fabrice Di Meglio
2014-04-08 14:21:10 -07:00
parent 821a0729ad
commit e2b9e07e5f
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,8 @@ public class DreamSettings extends SettingsPreferenceFragment {
public void onCreate(Bundle icicle) { public void onCreate(Bundle icicle) {
logd("onCreate(%s)", icicle); logd("onCreate(%s)", icicle);
super.onCreate(icicle); super.onCreate(icicle);
Activity activity = getActivity();
final Activity activity = getActivity();
mBackend = new DreamBackend(activity); mBackend = new DreamBackend(activity);
mSwitch = new Switch(activity); mSwitch = new Switch(activity);
@@ -99,18 +100,28 @@ public class DreamSettings extends SettingsPreferenceFragment {
final int padding = activity.getResources().getDimensionPixelSize( final int padding = activity.getResources().getDimensionPixelSize(
R.dimen.action_bar_switch_padding); R.dimen.action_bar_switch_padding);
mSwitch.setPaddingRelative(0, 0, padding, 0); mSwitch.setPaddingRelative(0, 0, padding, 0);
activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.END));
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@Override
public void onStart() {
logd("onStart()");
super.onStart();
final ActionBar actionBar = getActivity().getActionBar();
actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
ActionBar.DISPLAY_SHOW_CUSTOM);
actionBar.setCustomView(mSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.END));
}
@Override @Override
public void onDestroyView() { public void onDestroyView() {
logd("onDestroyView()");
getActivity().getActionBar().setCustomView(null); getActivity().getActionBar().setCustomView(null);
super.onDestroyView(); super.onDestroyView();
} }
@@ -121,7 +132,6 @@ public class DreamSettings extends SettingsPreferenceFragment {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
ListView listView = getListView(); ListView listView = getListView();
listView.setItemsCanFocus(true); listView.setItemsCanFocus(true);
TextView emptyView = (TextView) getView().findViewById(android.R.id.empty); TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);