diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-18 19:12:36 -0700 |
---|---|---|
committer | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-18 19:12:36 -0700 |
commit | 97a18c81119566164de3f548fb25f296f114d81f (patch) | |
tree | a5f910f5c1ef63a0137469cfa4462a0d4d2625d6 /src | |
parent | 712df6cb7050a87985ab30b8d1bad909a6bc09aa (diff) | |
download | packages_apps_Settings-97a18c81119566164de3f548fb25f296f114d81f.zip packages_apps_Settings-97a18c81119566164de3f548fb25f296f114d81f.tar.gz packages_apps_Settings-97a18c81119566164de3f548fb25f296f114d81f.tar.bz2 |
Fix Utils.prepareCustomPreferencesList()
- and thus fix padding for all Fragments using it
See bug: #13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I862c96d626ed906cbdafcfb40fa0e07bb804160f
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/settings/Utils.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 8211816..6255d2a 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -365,16 +365,20 @@ public final class Utils { public static void prepareCustomPreferencesList( ViewGroup parent, View child, View list, boolean ignoreSidePadding) { final boolean movePadding = list.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY; - if (movePadding && parent instanceof PreferenceFrameLayout) { - ((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true; - + if (movePadding) { final Resources res = list.getResources(); final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin); final int paddingBottom = res.getDimensionPixelSize( com.android.internal.R.dimen.preference_fragment_padding_bottom); - final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide; - list.setPaddingRelative(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom); + if (parent instanceof PreferenceFrameLayout) { + ((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true; + + final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide; + list.setPaddingRelative(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom); + } else { + list.setPaddingRelative(paddingSide, 0, paddingSide, paddingBottom); + } } } |