Remove all reference to settings_side_margin.
- 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
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 7b0b28e..e9f8d58 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2985,7 +2985,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/user_info_header.xml"
- line="95"
+ line="93"
column="11"/>
</issue>
diff --git a/res/layout-sw720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
deleted file mode 100644
index 80910c7..0000000
--- a/res/layout-sw720dp/tab_widget.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scrollbars="none"
- android:fillViewport="true">
-
- <TabWidget
- android:id="@android:id/tabs"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- style="?android:attr/tabWidgetStyle"
- android:paddingStart="@dimen/settings_side_margin"
- android:paddingEnd="@dimen/settings_side_margin"
- />
-</HorizontalScrollView>
diff --git a/res/layout/captioning_preview.xml b/res/layout/captioning_preview.xml
index 92824d5..b90c3a5 100644
--- a/res/layout/captioning_preview.xml
+++ b/res/layout/captioning_preview.xml
@@ -23,9 +23,7 @@
<FrameLayout
android:id="@+id/preview_viewport"
android:layout_width="match_parent"
- android:layout_height="@dimen/captioning_preview_height"
- android:paddingStart="@dimen/settings_side_margin"
- android:paddingEnd="@dimen/settings_side_margin" >
+ android:layout_height="@dimen/captioning_preview_height" >
<ImageView
android:layout_width="match_parent"
diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml
index 852ef6d..0fa5f9f 100644
--- a/res/layout/preference_list_fragment.xml
+++ b/res/layout/preference_list_fragment.xml
@@ -33,9 +33,7 @@
android:id="@android:id/list_container"
android:layout_height="0px"
android:layout_weight="1"
- android:layout_width="match_parent"
- android:paddingStart="@dimen/settings_side_margin"
- android:paddingEnd="@dimen/settings_side_margin">
+ android:layout_width="match_parent">
<include layout="@layout/loading_container" />
diff --git a/res/layout/trusted_credentials.xml b/res/layout/trusted_credentials.xml
index d6b7c8f..31f5f40 100644
--- a/res/layout/trusted_credentials.xml
+++ b/res/layout/trusted_credentials.xml
@@ -16,9 +16,7 @@
<TabHost
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/settings_side_margin"
- android:paddingEnd="@dimen/settings_side_margin">
+ android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
diff --git a/res/layout/user_credentials.xml b/res/layout/user_credentials.xml
deleted file mode 100644
index c9ff51e..0000000
--- a/res/layout/user_credentials.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/settings_side_margin"
- android:paddingEnd="@dimen/settings_side_margin">
-
- <ListView
- android:id="@+id/credential_list"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:scrollbarStyle="outsideOverlay">
- </ListView>
-
-</LinearLayout>
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
index 57f01c7..5135e0e 100644
--- a/res/layout/user_info_header.xml
+++ b/res/layout/user_info_header.xml
@@ -21,9 +21,7 @@
android:gravity="center_vertical"
android:orientation="vertical"
android:focusable="true"
- android:clickable="true"
- android:paddingStart="@dimen/settings_side_margin"
- android:paddingEnd="@dimen/settings_side_margin" >
+ android:clickable="true" >
<LinearLayout
android:layout_width="match_parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 963d19f..a430db2 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -59,7 +59,6 @@
<dimen name="color_mode_preview_height">320dp</dimen>
<dimen name="ring_progress_bar_thickness">4dp</dimen>
- <dimen name="settings_side_margin">0dip</dimen>
<!-- Weight of the left pane in a multi-pane preference layout. -->
<integer name="preferences_left_pane_weight">4</integer>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 747210e..a907c62 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -69,8 +69,6 @@
</style>
<style name="PreferenceFragmentListSinglePane" parent="@*android:style/PreferenceFragmentList">
- <item name="android:paddingStart">@dimen/settings_side_margin</item>
- <item name="android:paddingEnd">@dimen/settings_side_margin</item>
<item name="android:layout_marginStart">0dp</item>
<item name="android:layout_marginEnd">0dp</item>
<item name="android:scrollbarStyle">outsideOverlay</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c7fafad..f2c1eae 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -38,7 +38,7 @@
<item name="wifi_signal_color">?android:attr/colorAccent</item>
<item name="wifi_friction">@drawable/wifi_friction</item>
- <item name="side_margin">@dimen/settings_side_margin</item>
+ <item name="side_margin">0dp</item>
<item name="sudListItemIconColor">?android:attr/colorAccent</item>
<!-- Redefine the ActionBar style for contentInsetStart -->
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 37643b3..804c783 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -270,27 +270,21 @@
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);