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

Commit 74357cd9 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Tune visuals for inline settings" into nyc-dev 

am: 196c8f79

* commit '196c8f79':
  Tune visuals for inline settings
parents 68515252 196c8f79

packages/SystemUI/res/layout/notification_guts.xml

+6 −7
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ 
    <!-- header -->

    <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="30dp"

            android:paddingTop="9dp"

            android:layout_height="wrap_content"

            android:paddingTop="14dp"

            android:paddingEnd="8dp"

            android:id="@+id/notification_guts_header"

            android:orientation="horizontal"

            android:layout_gravity="center_vertical|start">

            android:layout_gravity="start">



        <ImageView

                android:id="@+id/app_icon"
@@ -64,7 +64,6 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingTop="4dp"

            android:paddingBottom="16dip"

            android:paddingEnd="8dp" >

        <RadioButton

                android:id="@+id/silent_importance"
@@ -99,7 +98,6 @@ 
            android:orientation="vertical"

            android:clickable="false"

            android:focusable="false"

            android:paddingBottom="8dip"

            android:paddingEnd="8dp"

            android:visibility="gone">

        <TextView
@@ -166,13 +164,14 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="end"

            android:paddingTop="16dp"

            android:paddingBottom="8dp" >



        <TextView

            android:id="@+id/more_settings"

            android:text="@string/notification_more_settings"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_height="36dp"

            style="@style/TextAppearance.NotificationGuts.Button"

            android:background="@drawable/btn_borderless_rect"

            android:gravity="center"
@@ -184,7 +183,7 @@ 
            android:id="@+id/done"

            android:text="@string/notification_done"

            android:layout_width="wrap_content"

            android:layout_height="48dp"

            android:layout_height="36dp"

            style="@style/TextAppearance.NotificationGuts.Button"

            android:background="@drawable/btn_borderless_rect"

            android:gravity="center"

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ 


    <style name="TextAppearance.NotificationGuts">

        <item name="android:textSize">14sp</item>

        <item name="android:fontFamily">sans-serif-medium</item>

        <item name="android:fontFamily">roboto-regular</item>

        <item name="android:textColor">@android:color/black</item>

    </style>