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

show the dream enable switch in all conditions.

Browse Source 
Bug: 7229905
Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
This commit is contained in:
Chris Wren
2012-09-26 14:39:05 -04:00
parent 49dc982556
commit 63707af94a
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,9 +96,7 @@ public class DreamSettings extends SettingsPreferenceFragment {
} }
} }
}); });
if (activity instanceof PreferenceActivity) {
PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
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.setPadding(0, 0, padding, 0); mSwitch.setPadding(0, 0, padding, 0);
@@ -108,11 +106,16 @@ public class DreamSettings extends SettingsPreferenceFragment {
ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT, ActionBar.LayoutParams.WRAP_CONTENT,
Gravity.CENTER_VERTICAL | Gravity.END)); Gravity.CENTER_VERTICAL | Gravity.END));
}
}
setHasOptionsMenu(true); setHasOptionsMenu(true);
} }
@Override
public void onDestroyView() {
getActivity().getActionBar().setCustomView(null);
super.onDestroyView();
}
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
logd("onActivityCreated(%s)", savedInstanceState); logd("onActivityCreated(%s)", savedInstanceState);