Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b39148 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Fix preference screen padding for legacy apps (non Holo)."

parents e1e0613a 5691c7a2

core/res/res/layout/preference_list_content_single.xml

+1 −2
Original line number Diff line number Diff line
@@ -35,12 +35,11 @@ 
            android:layout_height="match_parent">



            <ListView android:id="@android:id/list"

                style="?attr/preferenceFragmentStyle"

                android:layout_width="match_parent"

                android:layout_height="0px"

                android:layout_weight="1"

                android:drawSelectorOnTop="false"

                android:paddingLeft="@dimen/preference_fragment_padding_side"

                android:paddingRight="@dimen/preference_fragment_padding_side"

                android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"

                android:cacheColorHint="@android:color/transparent"

                android:listPreferredItemHeight="48dp"

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

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 


    <!-- Preference activity, vertical padding for the header list -->

    <dimen name="preference_screen_header_vertical_padding">32dp</dimen>

    <dimen name="preference_screen_side_margin">0dp</dimen>

    <!-- Compensate for double margin : preference_screen_side_margin + 4 (frame background shadow) = -preference_screen_side_margin_negative -->

    <dimen name="preference_screen_side_margin_negative">-4dp</dimen>



</resources>

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -705,6 +705,8 @@ 


        <!-- Default style for PreferenceScreen. -->

        <attr name="preferenceScreenStyle" format="reference" />

        <!-- Default style for Headers pane in PreferenceActivity. -->

        <attr name="preferenceFragmentStyle" format="reference" />

        <!-- Default style for PreferenceCategory. -->

        <attr name="preferenceCategoryStyle" format="reference" />

        <!-- Default style for Preference. -->