diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-01-11 15:29:27 -0800 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2013-01-11 15:29:27 -0800 |
| commit | e428e02f16e563639784bc3d50e64ad75b45ca0d (patch) | |
| tree | e65c9d034eeda417275859227e1e3942e54bfa66 /src/com/android/settings/wfd | |
| parent | 0c13c64a6330de2043b203a60096860a9845747a (diff) | |
| download | packages_apps_Settings-e428e02f16e563639784bc3d50e64ad75b45ca0d.tar.gz packages_apps_Settings-e428e02f16e563639784bc3d50e64ad75b45ca0d.tar.bz2 packages_apps_Settings-e428e02f16e563639784bc3d50e64ad75b45ca0d.zip | |
Support wifi display settings on tablets.
Bug: 7612891
Change-Id: Ie1268f97e4c28cd9a321a966cd6952bd2a9bc281
Diffstat (limited to 'src/com/android/settings/wfd')
| -rwxr-xr-x | src/com/android/settings/wfd/WifiDisplaySettings.java | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index f1d0e70c99..9f9418dc62 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -93,24 +93,19 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { Activity activity = getActivity(); mActionBarSwitch = new Switch(activity); - if (activity instanceof PreferenceActivity) { - PreferenceActivity preferenceActivity = (PreferenceActivity) activity; - if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) { - final int padding = activity.getResources().getDimensionPixelSize( - R.dimen.action_bar_switch_padding); - mActionBarSwitch.setPadding(0, 0, padding, 0); - activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, - ActionBar.DISPLAY_SHOW_CUSTOM); - activity.getActionBar().setCustomView(mActionBarSwitch, - new ActionBar.LayoutParams( - ActionBar.LayoutParams.WRAP_CONTENT, - ActionBar.LayoutParams.WRAP_CONTENT, - Gravity.CENTER_VERTICAL | Gravity.END)); - } - } - mActionBarSwitch.setOnCheckedChangeListener(mSwitchOnCheckedChangedListener); + final int padding = activity.getResources().getDimensionPixelSize( + R.dimen.action_bar_switch_padding); + mActionBarSwitch.setPadding(0, 0, padding, 0); + activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, + ActionBar.DISPLAY_SHOW_CUSTOM); + activity.getActionBar().setCustomView(mActionBarSwitch, + new ActionBar.LayoutParams( + ActionBar.LayoutParams.WRAP_CONTENT, + ActionBar.LayoutParams.WRAP_CONTENT, + Gravity.CENTER_VERTICAL | Gravity.END)); + mEmptyView = (TextView) getView().findViewById(android.R.id.empty); getListView().setEmptyView(mEmptyView); |