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

Commit f2bfb865 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls - Setup" into sc-dev am: 2c389bf6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14354552

Change-Id: Ia0c892fa8496657657acaad1dc940e988f3f1958
parents d81054da 2c389bf6
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -787,15 +787,16 @@
    <style name="TextAppearance.ControlSetup">
        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
        <item name="android:textColor">@color/control_primary_text</item>
        <item name="android:singleLine">true</item>
    </style>

    <style name="TextAppearance.ControlSetup.Title">
        <item name="android:textSize">@dimen/controls_setup_title</item>
        <item name="android:singleLine">true</item>
    </style>

    <style name="TextAppearance.ControlSetup.Subtitle">
        <item name="android:textSize">@dimen/controls_setup_subtitle</item>
        <item name="android:maxLines">2</item>
    </style>

    <!-- The attributes used for title (textAppearanceLarge) and message (textAppearanceMedium)