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

Commit 7ec34c17 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix robolectric tests"

parents 64f9275f 0fea4003

res/layout/support_escalation_options.xml

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
            android:orientation="vertical">

            <Button

                android:id="@android:id/text1"

                style="@style/SupportPrimaryButton"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_margin="8dp"/>
@@ -86,7 +86,7 @@ 
            android:orientation="vertical">

            <Button

                android:id="@android:id/text2"

                style="@style/SupportPrimaryButton"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_margin="8dp"/>

res/layout/support_offline_escalation_options.xml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
    </LinearLayout>

    <Button

        android:id="@android:id/text1"

        style="@style/SupportPrimaryButton"

        style="@style/ActionPrimaryButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_margin="8dp"

res/layout/support_sign_in_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        android:textColor="?android:attr/textColorSecondary"/>

    <Button

        android:id="@android:id/text1"

        style="@style/SupportPrimaryButton"

        style="@style/ActionPrimaryButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_margin="8dp"/>

res/values/styles.xml

+0 −2
Original line number Diff line number Diff line
@@ -338,8 +338,6 @@ 


    <style name="TextAppearance.SupportSummary" parent="TextAppearance.CategoryTitle"/>



    <style name="SupportPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>



    <style name="SupportSecondaryButton"

           parent="android:Widget.DeviceDefault.Button.Borderless.Colored">

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

tests/robotests/res/values/themes.xml

+5 −1
Original line number Diff line number Diff line 
<resources>

    <style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings" />



    <!-- Override the main app's style for ActionPrimaryButton to get around lack of new style

         support in robolectric  -->

    <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button" />

</resources>