am 775b6e6d: Merge "consistent style for titles on user education screens" into ub-camera-glacier
* commit '775b6e6d8adab73fcae820c6600b173b258d5162':
consistent style for titles on user education screens
diff --git a/res/layout-land/aspect_ratio_dialog_content.xml b/res/layout-land/aspect_ratio_dialog_content.xml
index c183f1d..7aca76f 100644
--- a/res/layout-land/aspect_ratio_dialog_content.xml
+++ b/res/layout-land/aspect_ratio_dialog_content.xml
@@ -38,8 +38,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/photo_size_selection_title"
- android:textSize="22sp"
- android:textColor="@color/dialog_text_color"
+ style="@style/fullscreen_dialog_title"
android:layout_margin="28dp" />
<TextView
android:layout_width="match_parent"
diff --git a/res/layout-land/location_dialog_content.xml b/res/layout-land/location_dialog_content.xml
index 2577f69..e3dab88 100644
--- a/res/layout-land/location_dialog_content.xml
+++ b/res/layout-land/location_dialog_content.xml
@@ -30,8 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/remember_location_title"
- android:textSize="22sp"
- android:textColor="@color/dialog_text_color"
+ style="@style/fullscreen_dialog_title"
android:layout_marginLeft="28dp"
android:layout_marginRight="28dp"
android:layout_marginBottom="28dp" />
diff --git a/res/layout-port/aspect_ratio_dialog_content.xml b/res/layout-port/aspect_ratio_dialog_content.xml
index 087909e..4086889 100644
--- a/res/layout-port/aspect_ratio_dialog_content.xml
+++ b/res/layout-port/aspect_ratio_dialog_content.xml
@@ -27,8 +27,7 @@
android:layout_margin="28dp"
android:gravity="center"
android:text="@string/photo_size_selection_title"
- android:textSize="22sp"
- android:textColor="@color/dialog_text_color" />
+ style="@style/fullscreen_dialog_title" />
<include
layout="@layout/aspect_ratio_selector"
android:layout_width="match_parent"
diff --git a/res/layout-port/location_dialog_content.xml b/res/layout-port/location_dialog_content.xml
index 0e1e453..fee5d64 100644
--- a/res/layout-port/location_dialog_content.xml
+++ b/res/layout-port/location_dialog_content.xml
@@ -22,8 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/remember_location_title"
- android:textSize="22sp"
- android:textColor="@color/dialog_text_color"
+ style="@style/fullscreen_dialog_title"
android:layout_margin="28dp" />
<ImageView
android:layout_width="wrap_content"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ad38594..7c0f7ca 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -216,13 +216,18 @@
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
+ <style name="fullscreen_dialog_title">
+ <item name="android:textSize">24sp</item>
+ <item name="android:fontFamily">sans-serif-regular</item>
+ <item name="android:textColor">@color/dialog_text_color</item>
+ </style>
<style name="BlueButton">
<item name="android:layout_width">144dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:background">@drawable/button_cling</item>
- <item name="android:fontFamily">sans-serif-regular</item>
- <item name="android:textColor">@color/blue_button_text_color</item>
<item name="android:textSize">14sp</item>
+ <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:textColor">@color/blue_button_text_color</item>
<item name="android:padding">12dp</item>
</style>
</resources>