PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix robolectric tests"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-29 22:51:27 +00:00
committed by Android (Google) Code Review
parent 64f9275f4f 0fea400314
commit 7ec34c1781
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/support_escalation_options.xml
View File

@@ -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"/>

2
res/layout/support_offline_escalation_options.xml
View File

@@ -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"

2
res/layout/support_sign_in_button.xml
View File

@@ -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"/>

2
res/values/styles.xml
View File

@@ -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>

6
tests/robotests/res/values/themes.xml
View File

@@ -1,3 +1,7 @@
<resources>
<style name="Theme.Settings" parent="@android:style/Theme.DeviceDefault.Settings"/>
<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>