From e457f725b820c70a2c2182bae5baf5b23cc88de3 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Mon, 26 Jun 2017 18:06:59 -0700
Subject: Emergency dialer font and sizes

Change-Id: I854632c218be86af4803214e50b627576278d33f
Fixes: 62411556
Bug: 62785536
---
 res/layout/dialpad_view_unthemed.xml | 2 +-
 res/values/dimens.xml                | 4 ++--
 res/values/styles.xml                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml
index 0516a36..78a4ead 100644
--- a/res/layout/dialpad_view_unthemed.xml
+++ b/res/layout/dialpad_view_unthemed.xml
@@ -111,7 +111,7 @@
             android:cursorVisible="false"
             android:textColor="?attr/dialpad_text_color"
             android:textCursorDrawable="@null"
-            android:fontFamily="sans-serif"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
             android:textStyle="normal"
             ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7734bd4..418a3f6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -30,7 +30,7 @@
     <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
     <dimen name="dialpad_key_plus_size">18sp</dimen>
     <dimen name="dialpad_horizontal_padding">5dp</dimen>
-    <dimen name="dialpad_digits_text_size">34sp</dimen>
+    <dimen name="dialpad_digits_text_size">32sp</dimen>
     <dimen name="dialpad_digits_text_min_size">24sp</dimen>
     <dimen name="dialpad_digits_height">60dp</dimen>
     <!-- Provide adjustable dimensions so that different apps can use different dialpad sizes. -->
@@ -47,7 +47,7 @@
     <dimen name="dialpad_space_above_keys">14dp</dimen>
     <dimen name="dialpad_space_below_keys">8dp</dimen>
     <!-- The bottom space of the dialpad to account for the dial button -->
-    <dimen name="dialpad_bottom_space_height">80dp</dimen>
+    <dimen name="dialpad_bottom_space_height">124dp</dimen>
 
     <!-- Height of the floating action button -->
     <dimen name="floating_action_button_height">56dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3ec34c1..7488e5d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,7 +30,7 @@
     <style name="DialpadKeyNumberStyle">
         <item name="android:textColor">?attr/dialpad_text_color_primary</item>
         <item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
-        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginBottom">@dimen/dialpad_key_number_margin_bottom</item>
@@ -44,7 +44,7 @@
     <style name="DialpadKeyStarStyle">
         <item name="android:textColor">?attr/dialpad_text_color_secondary</item>
         <item name="android:textSize">@dimen/dialpad_key_star_size</item>
-        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
         <item name="android:alpha">0.8</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -55,7 +55,7 @@
     <style name="DialpadKeyPoundStyle">
         <item name="android:textColor">?attr/dialpad_text_color_secondary</item>
         <item name="android:textSize">@dimen/dialpad_key_pound_size</item>
-        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
         <item name="android:alpha">0.8</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-- 
cgit v1.2.3


From 05359c683a81637a5d5cfcfd783da56bd2909542 Mon Sep 17 00:00:00 2001
From: Lucas Dupin <dupin@google.com>
Date: Tue, 27 Jun 2017 20:58:20 +0000
Subject: Revert "Emergency dialer font and sizes"

This reverts commit e457f725b820c70a2c2182bae5baf5b23cc88de3.

Accessing internal property broke unbundled branch

Change-Id: If68e859f38830b72f52533f99dcdc69f4a271f28
---
 res/layout/dialpad_view_unthemed.xml | 2 +-
 res/values/dimens.xml                | 4 ++--
 res/values/styles.xml                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/layout/dialpad_view_unthemed.xml b/res/layout/dialpad_view_unthemed.xml
index 78a4ead..0516a36 100644
--- a/res/layout/dialpad_view_unthemed.xml
+++ b/res/layout/dialpad_view_unthemed.xml
@@ -111,7 +111,7 @@
             android:cursorVisible="false"
             android:textColor="?attr/dialpad_text_color"
             android:textCursorDrawable="@null"
-            android:fontFamily="@*android:string/config_headlineFontFamily"
+            android:fontFamily="sans-serif"
             android:textStyle="normal"
             ex:resizing_text_min_size="@dimen/dialpad_digits_text_min_size" />
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 418a3f6..7734bd4 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -30,7 +30,7 @@
     <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>
     <dimen name="dialpad_key_plus_size">18sp</dimen>
     <dimen name="dialpad_horizontal_padding">5dp</dimen>
-    <dimen name="dialpad_digits_text_size">32sp</dimen>
+    <dimen name="dialpad_digits_text_size">34sp</dimen>
     <dimen name="dialpad_digits_text_min_size">24sp</dimen>
     <dimen name="dialpad_digits_height">60dp</dimen>
     <!-- Provide adjustable dimensions so that different apps can use different dialpad sizes. -->
@@ -47,7 +47,7 @@
     <dimen name="dialpad_space_above_keys">14dp</dimen>
     <dimen name="dialpad_space_below_keys">8dp</dimen>
     <!-- The bottom space of the dialpad to account for the dial button -->
-    <dimen name="dialpad_bottom_space_height">124dp</dimen>
+    <dimen name="dialpad_bottom_space_height">80dp</dimen>
 
     <!-- Height of the floating action button -->
     <dimen name="floating_action_button_height">56dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7488e5d..3ec34c1 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,7 +30,7 @@
     <style name="DialpadKeyNumberStyle">
         <item name="android:textColor">?attr/dialpad_text_color_primary</item>
         <item name="android:textSize">@dimen/dialpad_key_numbers_size</item>
-        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
+        <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginBottom">@dimen/dialpad_key_number_margin_bottom</item>
@@ -44,7 +44,7 @@
     <style name="DialpadKeyStarStyle">
         <item name="android:textColor">?attr/dialpad_text_color_secondary</item>
         <item name="android:textSize">@dimen/dialpad_key_star_size</item>
-        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
+        <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:alpha">0.8</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -55,7 +55,7 @@
     <style name="DialpadKeyPoundStyle">
         <item name="android:textColor">?attr/dialpad_text_color_secondary</item>
         <item name="android:textSize">@dimen/dialpad_key_pound_size</item>
-        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>
+        <item name="android:fontFamily">sans-serif-light</item>
         <item name="android:alpha">0.8</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-- 
cgit v1.2.3


From 72fb3f075edb29326b81efa00f3db3024b9e2b35 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 30 Jun 2017 16:15:53 -0700
Subject: Import translations. DO NOT MERGE

Change-Id: I6787f38a19b194be4ea902e6d09887bdeca87163
Auto-generated-cl: translation import
---
 res/values-ca/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 275b2c8..61e9142 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -35,7 +35,7 @@
     <string name="callFailed_limitExceeded" msgid="8796663077702587664">"Límit d\'ACM superat"</string>
     <string name="callFailed_powerOff" msgid="9179061328562234362">"Senyal mòbil desactivat"</string>
     <string name="callFailed_simError" msgid="3307159523385380486">"Cap SIM o error de la SIM"</string>
-    <string name="callFailed_outOfService" msgid="4535901975891969115">"La xarxa de telefonia mòbil no està disponible."</string>
+    <string name="callFailed_outOfService" msgid="4535901975891969115">"La xarxa mòbil no està disponible."</string>
     <string name="callFailed_fdn_only" msgid="1720606112619022283">"FDN restringeix les trucades de sortida."</string>
     <string name="callFailed_dialToUssd" msgid="2093563828737170617">"La sol·licitud DIAL s\'ha transformat en una sol·licitud USSD."</string>
     <string name="callFailed_dialToSs" msgid="3144952834772702469">"La sol·licitud DIAL s\'ha transformat en una sol·licitud SS."</string>
-- 
cgit v1.2.3