Merge "Make BugReportInfoActivity foreground colors brighter" into rvc-dev am: 75e5794d05 am: 5795bf02b1
Change-Id: Ie0077aec451e98f44149127726df2ff53c5e42b5
diff --git a/tests/BugReportApp/res/layout/bug_info_view.xml b/tests/BugReportApp/res/layout/bug_info_view.xml
index 199b368..1841f9c 100644
--- a/tests/BugReportApp/res/layout/bug_info_view.xml
+++ b/tests/BugReportApp/res/layout/bug_info_view.xml
@@ -30,8 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
- android:textColor="@*android:color/car_yellow_500"
- android:textSize="@dimen/bug_report_default_text_size" />
+ style="@style/TextAppearance.BugReportUi.Title" />
<LinearLayout
android:layout_width="wrap_content"
@@ -42,12 +41,12 @@
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
android:text="@string/bugreport_info_status"
- android:textSize="@dimen/bug_report_default_text_size" />
+ style="@style/TextAppearance.BugReportUi.Body" />
<TextView
android:id="@+id/bug_info_row_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="@dimen/bug_report_default_text_size" />
+ style="@style/TextAppearance.BugReportUi.Body" />
</LinearLayout>
<TextView
@@ -55,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
- android:textSize="@dimen/bug_report_default_text_size" />
+ style="@style/TextAppearance.BugReportUi.Body" />
<LinearLayout
android:layout_width="wrap_content"
@@ -68,8 +67,8 @@
android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
android:visibility="gone"
- android:textSize="@dimen/bug_report_button_text_size"
- android:text="@string/bugreport_add_audio_button_text" />
+ android:text="@string/bugreport_add_audio_button_text"
+ style="@style/Widget.BugReportUi.InfoActionButton" />
<Button
android:id="@+id/bug_info_upload_button"
android:layout_width="wrap_content"
@@ -77,16 +76,16 @@
android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
android:layout_marginRight="@dimen/bug_report_horizontal_layout_children_margin"
android:visibility="gone"
- android:textSize="@dimen/bug_report_button_text_size"
- android:text="@string/bugreport_upload_button_text" />
+ android:text="@string/bugreport_upload_button_text"
+ style="@style/Widget.BugReportUi.InfoActionButton" />
<Button
android:id="@+id/bug_info_move_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bug_report_user_action_button_padding"
android:visibility="gone"
- android:textSize="@dimen/bug_report_button_text_size"
- android:text="@string/bugreport_move_button_text" />
+ android:text="@string/bugreport_move_button_text"
+ style="@style/Widget.BugReportUi.InfoActionButton" />
</LinearLayout>
</LinearLayout>
diff --git a/tests/BugReportApp/res/layout/bug_report_info_activity.xml b/tests/BugReportApp/res/layout/bug_report_info_activity.xml
index 1cbe9d4..4cc6fbf 100644
--- a/tests/BugReportApp/res/layout/bug_report_info_activity.xml
+++ b/tests/BugReportApp/res/layout/bug_report_info_activity.xml
@@ -32,13 +32,13 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/bugreport_info_quit"
- style="?android:attr/borderlessButtonStyle" />
+ style="@style/android:Widget.DeviceDefault.Button.Borderless.Colored" />
<Button
android:id="@+id/start_bug_report_button"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/bugreport_info_start"
- style="?android:attr/borderlessButtonStyle" />
+ style="@style/android:Widget.DeviceDefault.Button.Borderless.Colored" />
<TextView
android:id="@+id/version_text_view"
android:layout_height="wrap_content"
@@ -46,7 +46,8 @@
android:layout_weight="1"
android:textSize="14sp"
android:gravity="right"
- android:text="" />
+ android:text=""
+ style="@style/android:TextAppearance.DeviceDefault" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
diff --git a/tests/BugReportApp/res/values/dimens.xml b/tests/BugReportApp/res/values/dimens.xml
index 7f7967f..cb41f89 100644
--- a/tests/BugReportApp/res/values/dimens.xml
+++ b/tests/BugReportApp/res/values/dimens.xml
@@ -20,6 +20,7 @@
<dimen name="bug_report_padding">30dp</dimen>
<dimen name="bug_report_default_text_size">28dp</dimen>
+ <dimen name="bug_report_small_text_size">24dp</dimen>
<!-- VoiceRecordingView dimensions -->
<dimen name="bug_report_voice_recording_margin_top">20dp</dimen>
diff --git a/tests/BugReportApp/res/values/styles.xml b/tests/BugReportApp/res/values/styles.xml
index 6d8dd96..9b146a2 100644
--- a/tests/BugReportApp/res/values/styles.xml
+++ b/tests/BugReportApp/res/values/styles.xml
@@ -22,4 +22,17 @@
<item name="android:clickable">true</item>
<item name="android:background">@drawable/item_background</item>
</style>
+
+ <style name="Widget.BugReportUi.InfoActionButton" parent="android:Widget.DeviceDefault.Button">
+ <item name="android:textSize">@dimen/bug_report_button_text_size</item>
+ </style>
+
+ <style name="TextAppearance.BugReportUi.Title" parent="android:TextAppearance.DeviceDefault">
+ <item name="android:textSize">@dimen/bug_report_default_text_size</item>
+ </style>
+
+ <style name="TextAppearance.BugReportUi.Body" parent="android:TextAppearance.DeviceDefault">
+ <item name="android:textColor">@*android:color/car_body1</item>
+ <item name="android:textSize">@dimen/bug_report_small_text_size</item>
+ </style>
</resources>