Skip to content

Commit 48b3914

Browse files
Amith YamasaniAndroid (Google) Code Review
Amith Yamasani
authored and
Android (Google) Code Review
committed
Merge "Fix preference screen padding for legacy apps (non Holo)."
2 parents e1e0613 + 5691c7a commit 48b3914

8 files changed

Lines changed: 21 additions & 4 deletions

File tree

‎core/res/res/layout/preference_list_content_single.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@
3535
android:layout_height="match_parent">
3636

3737
<ListView android:id="@android:id/list"
38+
style="?attr/preferenceFragmentStyle"
3839
android:layout_width="match_parent"
3940
android:layout_height="0px"
4041
android:layout_weight="1"
4142
android:drawSelectorOnTop="false"
42-
android:paddingLeft="@dimen/preference_fragment_padding_side"
43-
android:paddingRight="@dimen/preference_fragment_padding_side"
4443
android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"
4544
android:cacheColorHint="@android:color/transparent"
4645
android:listPreferredItemHeight="48dp"

core/res/res/values-w1024dp/dimens.xml renamed to core/res/res/values-sw600dp-w1024dp/dimens.xml

File renamed without changes.

core/res/res/values-w1280dp/dimens.xml renamed to core/res/res/values-sw600dp-w1280dp/dimens.xml

File renamed without changes.

‎core/res/res/values-sw600dp/dimens.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050

5151
<!-- Preference activity, vertical padding for the header list -->
5252
<dimen name="preference_screen_header_vertical_padding">32dp</dimen>
53+
<dimen name="preference_screen_side_margin">0dp</dimen>
54+
<!-- Compensate for double margin : preference_screen_side_margin + 4 (frame background shadow) = -preference_screen_side_margin_negative -->
55+
<dimen name="preference_screen_side_margin_negative">-4dp</dimen>
5356

5457
</resources>
5558

‎core/res/res/values/attrs.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,8 @@
705705

706706
<!-- Default style for PreferenceScreen. -->
707707
<attr name="preferenceScreenStyle" format="reference" />
708+
<!-- Default style for Headers pane in PreferenceActivity. -->
709+
<attr name="preferenceFragmentStyle" format="reference" />
708710
<!-- Default style for PreferenceCategory. -->
709711
<attr name="preferenceCategoryStyle" format="reference" />
710712
<!-- Default style for Preference. -->

‎core/res/res/values/dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<!-- Preference activity side margins -->
7979
<dimen name="preference_screen_side_margin">0dp</dimen>
8080
<!-- Preference activity side margins negative-->
81-
<dimen name="preference_screen_side_margin_negative">-4dp</dimen>
81+
<dimen name="preference_screen_side_margin_negative">0dp</dimen>
8282
<!-- Preference activity top margin -->
8383
<dimen name="preference_screen_top_margin">0dp</dimen>
8484
<!-- Preference activity bottom margin -->

‎core/res/res/values/styles.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,12 @@ please see styles_device_defaults.xml.
910910
<style name="Preference">
911911
<item name="android:layout">@android:layout/preference</item>
912912
</style>
913-
913+
914+
<style name="PreferenceFragment">
915+
<item name="android:paddingLeft">0dp</item>
916+
<item name="android:paddingRight">0dp</item>
917+
</style>
918+
914919
<style name="Preference.Information">
915920
<item name="android:layout">@android:layout/preference_information</item>
916921
<item name="android:enabled">false</item>
@@ -961,6 +966,11 @@ please see styles_device_defaults.xml.
961966
<item name="android:layout">@android:layout/preference_holo</item>
962967
</style>
963968

969+
<style name="PreferenceFragment.Holo">
970+
<item name="android:paddingLeft">@dimen/preference_fragment_padding_side</item>
971+
<item name="android:paddingRight">@dimen/preference_fragment_padding_side</item>
972+
</style>
973+
964974
<style name="Preference.Holo.Information">
965975
<item name="android:layout">@android:layout/preference_information_holo</item>
966976
<item name="android:enabled">false</item>

‎core/res/res/values/themes.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ please see themes_device_defaults.xml.
275275

276276
<!-- Preference styles -->
277277
<item name="preferenceScreenStyle">@android:style/Preference.PreferenceScreen</item>
278+
<item name="preferenceFragmentStyle">@style/PreferenceFragment</item>
278279
<item name="preferenceCategoryStyle">@android:style/Preference.Category</item>
279280
<item name="preferenceStyle">@android:style/Preference</item>
280281
<item name="preferenceInformationStyle">@android:style/Preference.Information</item>
@@ -1071,6 +1072,7 @@ please see themes_device_defaults.xml.
10711072

10721073
<!-- Preference styles -->
10731074
<item name="preferenceScreenStyle">@android:style/Preference.Holo.PreferenceScreen</item>
1075+
<item name="preferenceFragmentStyle">@style/PreferenceFragment.Holo</item>
10741076
<item name="preferenceCategoryStyle">@android:style/Preference.Holo.Category</item>
10751077
<item name="preferenceStyle">@android:style/Preference.Holo</item>
10761078
<item name="preferenceInformationStyle">@android:style/Preference.Holo.Information</item>
@@ -1378,6 +1380,7 @@ please see themes_device_defaults.xml.
13781380

13791381
<!-- Preference styles -->
13801382
<item name="preferenceScreenStyle">@android:style/Preference.Holo.PreferenceScreen</item>
1383+
<item name="preferenceFragmentStyle">@style/PreferenceFragment.Holo</item>
13811384
<item name="preferenceCategoryStyle">@android:style/Preference.Holo.Category</item>
13821385
<item name="preferenceStyle">@android:style/Preference.Holo</item>
13831386
<item name="preferenceInformationStyle">@android:style/Preference.Holo.Information</item>

0 commit comments

Comments
 (0)