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

Commit ccd17cc2 authored by Bill's avatar Bill Committed by Bill Lin
Browse files

Fallback DocumentsUI fontFamily to system default 

Use android.support.design.button.MaterialButton instead of Button
Remove unused Button Style

Bug: 112771446
Test: atest DocumentsUITests
Change-Id: If314d974776f1ad5d0a9be66ca91e56ef93c9979
parent 0a159792

res/layout/fragment_pick.xml

+8 −6
Original line number Diff line number Diff line
@@ -21,15 +21,17 @@ 
    android:baselineAligned="false"

    android:gravity="end"

    android:paddingEnd="@dimen/bottom_bar_padding_end">

    <Button

        style="@style/BottomBarButton.Secondary"



    <android.support.design.button.MaterialButton

        android:id="@android:id/button2"

        style="@style/Widget.MaterialComponents.Button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@android:string/cancel"/>

    <Button

        style="@style/BottomBarButton.Primary"



    <android.support.design.button.MaterialButton

        android:id="@android:id/button1"

        style="@style/Widget.MaterialComponents.Button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"/>

</LinearLayout>

res/layout/fragment_save.xml

+3 −3
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent">



        <Button

            style="@style/BottomBarButton.Primary"

        <android.support.design.button.MaterialButton

            android:id="@android:id/button1"

            style="@style/Widget.MaterialComponents.Button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:text="@string/menu_save"/>

res/layout/inspector_section_title.xml

+2 −4
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
        android:paddingTop="5dp"

        android:paddingBottom="5dp"

        android:layout_gravity="center_vertical"

        android:fontFamily="sans-serif-medium"

        android:textSize="15sp"

        android:textAlignment="viewStart"

        android:textColor="@color/inspector_section_title"/>

        android:textAppearance="?attr/textAppearanceHeadline6"

        android:textAlignment="viewStart"/>

</LinearLayout>
 
 No newline at end of file

res/values/styles.xml

+2 −28
Original line number Diff line number Diff line
@@ -45,35 +45,9 @@ 
        <item name="android:maxHeight">3dp</item>

    </style>



    <style name="BottomBarButton.Primary" parent="Widget.AppCompat.Button.Colored">

        <item name="android:buttonStyle">@style/BottomBarButton.Primary</item>

        <item name="android:theme">@style/BottomBarButton.Primary</item>



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

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

        <item name="android:paddingLeft">@dimen/bottom_bar_button_horizontal_padding</item>

        <item name="android:paddingRight">@dimen/bottom_bar_button_horizontal_padding</item>

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

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

        <item name="android:buttonCornerRadius">@dimen/bottom_bar_button_corner_radius</item>

    </style>



    <style name="BottomBarButton.Secondary" parent="Widget.AppCompat.Button.Borderless.Colored">

        <item name="android:buttonStyle">@style/BottomBarButton.Secondary</item>

        <item name="android:theme">@style/BottomBarButton.Secondary</item>



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

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

        <item name="android:paddingLeft">@dimen/bottom_bar_button_horizontal_padding</item>

        <item name="android:paddingRight">@dimen/bottom_bar_button_horizontal_padding</item>

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

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

        <item name="android:buttonCornerRadius">@dimen/bottom_bar_button_corner_radius</item>

    </style>



    <style name="SortTitle" parent="android:style/TextAppearance.Material.Widget.ActionBar.Subtitle" >

    <style name="SortTitle" parent="@style/TextAppearance.MaterialComponents.Headline6" >

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

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

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

    </style>



    <style name="DrawerMenuPrimary" parent="android:style/TextAppearance.Material.Body2">