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

Remove all reference to settings_side_margin.

Browse Source 
- since the overlay of the value for bigger screen has been removed,
the side margin is now always 0dp. Remove this dimen value and all
reference to it.

Fixes: 124526984
Test: rebuild and visual
Change-Id: I68ff42513a379111042cab9b34594822544e246e
This commit is contained in:
Doris Ling
2019-02-20 16:33:24 -08:00
parent 7646786cd3
commit c5a1b4f666
11 changed files with 9 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -270,27 +270,21 @@ public final class Utils extends com.android.settingslib.Utils {
final boolean movePadding = list.getScrollBarStyle() == View.SCROLLBARS_OUTSIDE_OVERLAY;
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);
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);
}
list.setPaddingRelative(0 /* start */, 0 /* top */, 0 /* end */, paddingBottom);
}
}
public static void forceCustomPadding(View view, boolean additive) {
final Resources res = view.getResources();
final int paddingSide = res.getDimensionPixelSize(R.dimen.settings_side_margin);
final int paddingStart = paddingSide + (additive ? view.getPaddingStart() : 0);
final int paddingEnd = paddingSide + (additive ? view.getPaddingEnd() : 0);
final int paddingStart = additive ? view.getPaddingStart() : 0;
final int paddingEnd = additive ? view.getPaddingEnd() : 0;
final int paddingBottom = res.getDimensionPixelSize(
com.android.internal.R.dimen.preference_fragment_padding_bottom);