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

Commit c17513ef authored by Danny Epstein's avatar Danny Epstein Committed by Android (Google) Code Review
Browse files

Merge "Top and bottom padding for watch preferences." into nyc-mr1-dev

parents 5df14a60 8b4d90f2

core/res/res/layout/preference_list_fragment.xml

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
            style="?attr/preferenceFragmentListStyle"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingTop="0dip"

            android:paddingBottom="@dimen/preference_fragment_padding_bottom"

            android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"

            android:clipToPadding="false"

            android:drawSelectorOnTop="false"

core/res/res/layout/preference_list_fragment_material.xml

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
        <ListView android:id="@android:id/list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingTop="0dip"

            android:paddingBottom="@dimen/preference_fragment_padding_bottom"

            style="?attr/preferenceFragmentListStyle"

            android:scrollbarStyle="@integer/preference_fragment_scrollbarStyle"

            android:clipToPadding="false"

core/res/res/values-notround/styles_micro.xml

+2 −0
Original line number Diff line number Diff line
@@ -17,4 +17,6 @@ 
    <style name="TextAppearance.Micro.AlertDialog.Message" parent="TextAppearance.Micro.Small">

        <item name="textAlignment">viewStart</item>

    </style>

    <style name="PreferenceFragment.Micro" parent="PreferenceFragment.Material"/>

    <style name="PreferenceFragmentList.Micro" parent="PreferenceFragmentList.Material"/>

</resources>

core/res/res/values-round/styles_micro.xml

+9 −0
Original line number Diff line number Diff line
@@ -17,4 +17,13 @@ 
    <style name="TextAppearance.Micro.AlertDialog.Message" parent="TextAppearance.Micro.Small">

        <item name="textAlignment">center</item>

    </style>

    <style name="PreferenceFragment.Micro" parent="PreferenceFragment.Material">

        <item name="paddingTop">22dp</item>

        <item name="paddingBottom">22dp</item>

        <item name="clipToPadding">false</item>

    </style>

    <style name="PreferenceFragmentList.Micro" parent="PreferenceFragmentList.Material">

        <item name="paddingTop">22dp</item>

        <item name="paddingBottom">22dp</item>

    </style>

</resources>

core/res/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -1122,6 +1122,8 @@ please see styles_device_defaults.xml. 
    <style name="PreferenceFragmentList">

        <item name="paddingStart">@dimen/preference_fragment_padding_side</item>

        <item name="paddingEnd">@dimen/preference_fragment_padding_side</item>

        <item name="paddingTop">0dp</item>

        <item name="paddingBottom">@dimen/preference_fragment_padding_bottom</item>

    </style>



    <!-- Other Misc Styles -->