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

Commit 230866b3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Profiles: update text style to match Settings"

parents 1ce6f3cf bec21e00

res/layout/abstract_trigger_row.xml

+6 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 


        android:layout_width="fill_parent"

        android:layout_height="26dip"

        android:paddingLeft="16dp"



        android:layout_alignParentBottom="true"

        android:layout_alignParentRight="true"
@@ -49,6 +50,8 @@ 


        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:paddingLeft="16dp"

        android:paddingTop="12dip"



        android:layout_above="@id/desc"

        android:layout_alignParentRight="true"
@@ -57,6 +60,6 @@ 
        android:layout_toEndOf="@id/icon"



        android:gravity="center_vertical"

        android:textStyle="bold" />

        android:textAppearance="@android:style/TextAppearance.Material.Subhead" />



</RelativeLayout>

res/layout/list_two_line_item.xml

+7 −6
Original line number Diff line number Diff line
@@ -10,18 +10,19 @@ 


    <TextView

        android:id="@+id/title"

        android:textSize="16sp"

        android:padding="4dp"

        android:textStyle="bold"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"/>

        android:layout_width="match_parent"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead"

        android:textColor="?android:attr/textColorPrimary" />



    <TextView

        android:id="@+id/summary"

        android:textSize="12sp"

        android:paddingLeft="4dp"

        android:paddingRight="4dp"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"/>

        android:layout_width="match_parent"

        android:textAppearance="@android:style/TextAppearance.Material.Body1"

        android:textColor="?android:attr/textColorSecondary" />



</LinearLayout>

res/layout/preference_profiles.xml

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
                android:visibility="gone"

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

                android:textSize="13sp"

                android:textColor="?android:attr/textColorSecondary"

                android:focusable="false"

                android:maxLines="4" />

res/layout/profile_list_header.xml

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingLeft="4dip"

    android:paddingTop="18dip"

    android:orientation="horizontal" >



    <TextView

        android:id="@+id/title"

        style="?android:attr/listSeparatorTextViewStyle"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content" />

        android:layout_height="wrap_content"

        android:textAppearance="@style/TextAppearance.CategoryTitle" />



</LinearLayout>

res/layout/profile_list_item.xml

+4 −4
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 


    <TextView

        android:id="@+id/title"

        android:textSize="16sp"

        android:padding="4dp"

        android:textStyle="bold"

        android:layout_height="match_parent"

        android:layout_width="match_parent"/>

        android:layout_width="match_parent"

        android:textSize="18sp"

        android:textAppearance="@android:style/TextAppearance.Material.Subhead" />



</LinearLayout>