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

Commit 9272d0d3 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Inherit TextAppearance.DeviceDefault for the RRO text font" into ub-launcher3-master

parents 06998835 72dae7f4

res/values/styles.xml

+4 −7
Original line number Original line Diff line number Diff line
@@ -126,7 +126,7 @@ 




    <style name="WidgetContainerTheme.Dark" />

    <style name="WidgetContainerTheme.Dark" />





    <style name="FastScrollerPopup" >

    <style name="FastScrollerPopup" parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:layout_width">wrap_content</item>

        <item name="android:layout_width">wrap_content</item>

        <item name="android:minWidth">@dimen/fastscroll_popup_width</item>

        <item name="android:minWidth">@dimen/fastscroll_popup_width</item>

        <item name="android:layout_height">@dimen/fastscroll_popup_height</item>

        <item name="android:layout_height">@dimen/fastscroll_popup_height</item>
@@ -142,7 +142,7 @@ 
    </style>

    </style>





    <!-- Base theme for BubbleTextView and sub classes -->

    <!-- Base theme for BubbleTextView and sub classes -->

    <style name="BaseIcon">

    <style name="BaseIcon" parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_gravity">center</item>

        <item name="android:layout_gravity">center</item>
@@ -150,7 +150,6 @@ 
        <item name="android:gravity">center_horizontal</item>

        <item name="android:gravity">center_horizontal</item>

        <item name="android:lines">1</item>

        <item name="android:lines">1</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

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

        <item name="android:defaultFocusHighlightEnabled">false</item>

        <item name="android:defaultFocusHighlightEnabled">false</item>





        <!-- No shadows in the base theme -->

        <!-- No shadows in the base theme -->
@@ -190,9 +189,7 @@ 




    <style name="DropTargetButton" parent="DropTargetButtonBase" />

    <style name="DropTargetButton" parent="DropTargetButtonBase" />





    <style name="TextTitle">

    <style name="TextTitle" parent="@android:style/TextAppearance.DeviceDefault" />

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

    </style>





    <style name="AllAppsEmptySearchBackground">

    <style name="AllAppsEmptySearchBackground">

        <item name="android:colorPrimary">#E0E0E0</item>

        <item name="android:colorPrimary">#E0E0E0</item>