diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-08-05 10:07:23 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2013-08-06 16:23:37 -0700 |
| commit | 56f51a8927f53bee81145fe29e63af8a87e6fd1b (patch) | |
| tree | e27181941730283dd589e764f13dbf1132d1ed2f /src | |
| parent | 8a181dd0d1e710a2376488b158d71db915f73be6 (diff) | |
| download | packages_apps_Settings-56f51a8927f53bee81145fe29e63af8a87e6fd1b.tar.gz packages_apps_Settings-56f51a8927f53bee81145fe29e63af8a87e6fd1b.tar.bz2 packages_apps_Settings-56f51a8927f53bee81145fe29e63af8a87e6fd1b.zip | |
Single pane for 10" Settings
Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/DataUsageSummary.java | 9 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/Utils.java | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java index 2b2cc989d..3d5678d2c 100644 --- a/src/com/android/settings/DataUsageSummary.java +++ b/src/com/android/settings/DataUsageSummary.java @@ -312,15 +312,10 @@ public class DataUsageSummary extends Fragment { // on parent container for inset. final boolean shouldInset = mListView.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY; - if (shouldInset) { - mInsetSide = view.getResources().getDimensionPixelOffset( - com.android.internal.R.dimen.preference_fragment_padding_side); - } else { - mInsetSide = 0; - } + mInsetSide = 0; // adjust padding around tabwidget as needed - prepareCustomPreferencesList(container, view, mListView, true); + prepareCustomPreferencesList(container, view, mListView, false); mTabHost.setup(); mTabHost.setOnTabChangedListener(mTabListener); diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 4221059b6..b05c62bcc 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -286,6 +286,11 @@ public class Settings extends PreferenceActivity } } + @Override + public boolean onIsMultiPane() { + return false; + } + private static final String[] ENTRY_FRAGMENTS = { WirelessSettings.class.getName(), WifiSettings.class.getName(), diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 58c0872da..861421691 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -448,8 +448,7 @@ public class Utils { ((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true; final Resources res = list.getResources(); - final int paddingSide = res.getDimensionPixelSize( - com.android.internal.R.dimen.preference_fragment_padding_side); + final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin); final int paddingBottom = res.getDimensionPixelSize( com.android.internal.R.dimen.preference_fragment_padding_bottom); |