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

Commit 010d7e51 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Change Preferences padding to match UI spec. 

Bug: 5091431
Change-Id: I1b657534c3ecccbddda1bece910da7f31d85291c
parent 8cceb1e4

core/java/android/view/View.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -8753,6 +8753,12 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit 
     * @see #SCROLLBARS_OUTSIDE_OVERLAY

     * @see #SCROLLBARS_OUTSIDE_OVERLAY

     * @see #SCROLLBARS_OUTSIDE_INSET

     * @see #SCROLLBARS_OUTSIDE_INSET

     */

     */

    @ViewDebug.ExportedProperty(mapping = {

            @ViewDebug.IntToString(from = SCROLLBARS_INSIDE_OVERLAY, to = "INSIDE_OVERLAY"),

            @ViewDebug.IntToString(from = SCROLLBARS_INSIDE_INSET, to = "INSIDE_INSET"),

            @ViewDebug.IntToString(from = SCROLLBARS_OUTSIDE_OVERLAY, to = "OUTSIDE_OVERLAY"),

            @ViewDebug.IntToString(from = SCROLLBARS_OUTSIDE_INSET, to = "OUTSIDE_INSET")

    })

    public int getScrollBarStyle() {

    public int getScrollBarStyle() {

        return mViewFlags & SCROLLBARS_STYLE_MASK;

        return mViewFlags & SCROLLBARS_STYLE_MASK;

    }

    }

core/res/res/layout/preference_category_holo.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,5 +18,5 @@ 
<TextView xmlns:android="http://schemas.android.com/apk/res/android"

<TextView xmlns:android="http://schemas.android.com/apk/res/android"

    style="?android:attr/listSeparatorTextViewStyle"

    style="?android:attr/listSeparatorTextViewStyle"

    android:id="@+android:id/title"

    android:id="@+android:id/title"

    android:paddingLeft="16dp"

    android:paddingLeft="@dimen/preference_item_padding_side"

/>
 
    android:paddingRight="@dimen/preference_item_padding_side" />

core/res/res/layout/preference_child_holo.xml

+6 −7
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:gravity="center_vertical"

    android:paddingLeft="16dip"

    android:paddingLeft="@dimen/preference_child_padding_side"

    android:paddingRight="?android:attr/scrollbarSize">

    android:paddingRight="?android:attr/scrollbarSize">





    <LinearLayout

    <LinearLayout
@@ -34,17 +34,16 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_gravity="center"

            />

            android:paddingRight="@dimen/preference_item_padding_inner" />

    </LinearLayout>

    </LinearLayout>





    <RelativeLayout

    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="32dip"

        android:layout_weight="1"

        android:layout_marginRight="6dip"

        android:paddingRight="@dimen/preference_item_padding_inner"

        android:layout_marginTop="6dip"

        android:paddingTop="6dip"

        android:layout_marginBottom="6dip"

        android:paddingBottom="6dip">

        android:layout_weight="1">





        <TextView android:id="@+android:id/title"

        <TextView android:id="@+android:id/title"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

core/res/res/layout/preference_holo.xml

+7 −7
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:gravity="center_vertical"

    android:paddingLeft="@dimen/preference_item_padding_side"

    android:paddingRight="?android:attr/scrollbarSize">

    android:paddingRight="?android:attr/scrollbarSize">





    <LinearLayout

    <LinearLayout
@@ -36,17 +37,16 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_gravity="center"

            android:minWidth="48dp"

            android:minWidth="48dp"

            />

            android:paddingRight="@dimen/preference_item_padding_inner" />

    </LinearLayout>

    </LinearLayout>





    <RelativeLayout

    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="16dip"

        android:layout_weight="1"

        android:layout_marginRight="8dip"

        android:paddingRight="@dimen/preference_item_padding_inner"

        android:layout_marginTop="6dip"

        android:paddingTop="6dip"

        android:layout_marginBottom="6dip"

        android:paddingBottom="6dip">

        android:layout_weight="1">





        <TextView android:id="@+android:id/title"

        <TextView android:id="@+android:id/title"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

core/res/res/layout/preference_information_holo.xml

+7 −7
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:gravity="center_vertical"

    android:paddingLeft="@dimen/preference_item_padding_side"

    android:paddingRight="?android:attr/scrollbarSize">

    android:paddingRight="?android:attr/scrollbarSize">





    <LinearLayout

    <LinearLayout
@@ -35,17 +36,16 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_gravity="center"

            />

            android:paddingRight="@dimen/preference_item_padding_inner" />

    </LinearLayout>

    </LinearLayout>





    <RelativeLayout

    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginLeft="16dip"

        android:layout_weight="1"

        android:layout_marginRight="6sp"

        android:paddingRight="@dimen/preference_item_padding_inner"

        android:layout_marginTop="6sp"

        android:paddingTop="6dip"

        android:layout_marginBottom="6sp"

        android:paddingBottom="6dip">

        android:layout_weight="1">





        <TextView android:id="@+android:id/title"

        <TextView android:id="@+android:id/title"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"