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

Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-19 02:19:50 +00:00
committed by Android (Google) Code Review
parent 39a2cbb32c 97a18c8111
commit 6f40485308
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/Utils.java
View File

@@ -373,16 +373,20 @@ public final class Utils {
public static void prepareCustomPreferencesList( public static void prepareCustomPreferencesList(
ViewGroup parent, View child, View list, boolean ignoreSidePadding) { ViewGroup parent, View child, View list, boolean ignoreSidePadding) {
final boolean movePadding = list.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY; final boolean movePadding = list.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY;
if (movePadding && parent instanceof PreferenceFrameLayout) { if (movePadding) {
((PreferenceFrameLayout.LayoutParams) child.getLayoutParams()).removeBorders = true;
final Resources res = list.getResources(); final Resources res = list.getResources();
final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin); final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin);
final int paddingBottom = res.getDimensionPixelSize( final int paddingBottom = res.getDimensionPixelSize(
com.android.internal.R.dimen.preference_fragment_padding_bottom); com.android.internal.R.dimen.preference_fragment_padding_bottom);
final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide; if (parent instanceof PreferenceFrameLayout) {
list.setPaddingRelative(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom); ((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);
}
} }
} }