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

Commit 415393f4 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Update for bug #17521147 Settings activity looks terrible on Volantis" into lmp-dev

parents da649073 a616367d

core/res/res/layout/preference_header_item_material.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textAppearance="?android:attr/textAppearanceListItem"

            android:ellipsize="marquee"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal" />

            android:fadingEdge="horizontal" />
@@ -54,7 +54,7 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

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

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

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

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

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textAppearance="?android:attr/textAppearanceListItemSecondary"

            android:ellipsize="end"

            android:ellipsize="end"

            android:maxLines="2" />

            android:maxLines="2" />

core/res/res/layout/preference_list_content_material.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,8 @@ 
                android:drawSelectorOnTop="false"

                android:drawSelectorOnTop="false"

                android:cacheColorHint="@color/transparent"

                android:cacheColorHint="@color/transparent"

                android:listPreferredItemHeight="48dp"

                android:listPreferredItemHeight="48dp"

                android:scrollbarAlwaysDrawVerticalTrack="true" />

                android:scrollbarAlwaysDrawVerticalTrack="true"

                android:divider="@null" />





            <FrameLayout android:id="@+id/list_footer"

            <FrameLayout android:id="@+id/list_footer"

                    android:layout_width="match_parent"

                    android:layout_width="match_parent"