From 46bc9299609936ad9514534c9877599a40b9c741 Mon Sep 17 00:00:00 2001
From: Sriram Ramasubramanian <sriram@mozilla.com>
Date: Thu, 7 Mar 2013 13:38:54 -0800
Subject: [PATCH] Bug 848961: Cleanup font-sizes in Android UI. [r=mfinkle]

--HG--
extra : rebase_source : 9a941ec2064df41457667ca29764bf6ea27896f5
---
 .../resources/layout-xlarge-land-v11/abouthome_content.xml  | 2 +-
 mobile/android/base/resources/layout/abouthome_content.xml  | 2 +-
 .../android/base/resources/layout/awesomebar_header_row.xml | 2 +-
 mobile/android/base/resources/layout/awesomebar_row.xml     | 2 +-
 .../base/resources/layout/awesomebar_suggestion_item.xml    | 2 +-
 .../base/resources/layout/awesomebar_suggestion_prompt.xml  | 6 +++---
 .../base/resources/layout/awesomebar_tab_indicator.xml      | 2 +-
 .../android/base/resources/layout/site_identity_popup.xml   | 6 +++---
 mobile/android/base/resources/values/styles.xml             | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
index 86caec980a8..053c50f8e70 100644
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml
@@ -50,7 +50,7 @@
                             android:drawablePadding="7dp"
                             android:gravity="center"
                             android:clickable="true"
-                            android:textSize="15sp"
+                            android:textSize="16sp"
                             android:textColor="#FFFFFF"
                             android:visibility="gone"
                             android:focusable="true"/>
diff --git a/mobile/android/base/resources/layout/abouthome_content.xml b/mobile/android/base/resources/layout/abouthome_content.xml
index 698efad15b9..6e3074383fc 100644
--- a/mobile/android/base/resources/layout/abouthome_content.xml
+++ b/mobile/android/base/resources/layout/abouthome_content.xml
@@ -60,7 +60,7 @@
                             android:drawablePadding="7dp"
                             android:gravity="center"
                             android:clickable="true"
-                            android:textSize="15sp"
+                            android:textSize="16sp"
                             android:textColor="#FFFFFF"
                             android:visibility="gone"
                             android:focusable="true"/>
diff --git a/mobile/android/base/resources/layout/awesomebar_header_row.xml b/mobile/android/base/resources/layout/awesomebar_header_row.xml
index fd2ac885e9e..16426e400d8 100644
--- a/mobile/android/base/resources/layout/awesomebar_header_row.xml
+++ b/mobile/android/base/resources/layout/awesomebar_header_row.xml
@@ -9,7 +9,7 @@
           android:layout_height="@dimen/awesomebar_header_row_height"
           android:background="@drawable/awesomebar_header_row"
           android:textColor="#222222"
-          android:textSize="13sp"
+          android:textSize="14sp"
           android:textStyle="bold"
           android:gravity="center_vertical"
           android:paddingLeft="6dip"
diff --git a/mobile/android/base/resources/layout/awesomebar_row.xml b/mobile/android/base/resources/layout/awesomebar_row.xml
index 9ae6e5f9c94..475c6c446da 100644
--- a/mobile/android/base/resources/layout/awesomebar_row.xml
+++ b/mobile/android/base/resources/layout/awesomebar_row.xml
@@ -46,7 +46,7 @@
               android:layout_marginLeft="6dip"
               android:layout_marginRight="6dip"
               android:textColor="#9198A1"
-              android:textSize="13sp"
+              android:textSize="14sp"
               android:layout_below="@id/title"
               android:layout_toRightOf="@id/favicon"
               android:layout_toLeftOf="@id/bookmark_icon"
diff --git a/mobile/android/base/resources/layout/awesomebar_suggestion_item.xml b/mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
index 2e64e4ff2cb..482deb837a6 100644
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_item.xml
@@ -21,7 +21,7 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:textColor="#222222"
-              android:textSize="13sp"
+              android:textSize="14sp"
               android:gravity="center_vertical"
               android:layout_gravity="center_vertical"/>
 
diff --git a/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml b/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
index 1428a823600..286efc3181d 100644
--- a/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
+++ b/mobile/android/base/resources/layout/awesomebar_suggestion_prompt.xml
@@ -22,13 +22,13 @@
                         android:layout_width="wrap_content"
                         android:textColor="@color/awesome_bar_title"
                         android:layout_marginLeft="6dip"
-                        android:textSize="13sp"
+                        android:textSize="14sp"
                         android:layout_weight="1" />
 
         <TextView android:id="@+id/suggestions_prompt_yes"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:textSize="13sp"
+                android:textSize="14sp"
                 android:layout_marginLeft="15dip"
                 android:background="@drawable/suggestion_selector"
                 android:paddingLeft="15dp"
@@ -41,7 +41,7 @@
         <TextView android:id="@+id/suggestions_prompt_no"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:textSize="13sp"
+                android:textSize="14sp"
                 android:layout_marginLeft="6dip"
                 android:background="@drawable/suggestion_selector"
                 android:paddingLeft="15dp"
diff --git a/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml b/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
index fa0cf08f7ee..56695e40d6a 100644
--- a/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
+++ b/mobile/android/base/resources/layout/awesomebar_tab_indicator.xml
@@ -13,6 +13,6 @@
                 android:padding="10dp"
                 android:singleLine="true"
                 android:ellipsize="marquee"
-                android:textSize="13sp"
+                android:textSize="14sp"
                 android:textColor="@color/awesome_bar_title"
                 gecko:autoUpdateTheme="false"/>
diff --git a/mobile/android/base/resources/layout/site_identity_popup.xml b/mobile/android/base/resources/layout/site_identity_popup.xml
index dbdfa1d05f2..9d52e99ff4a 100644
--- a/mobile/android/base/resources/layout/site_identity_popup.xml
+++ b/mobile/android/base/resources/layout/site_identity_popup.xml
@@ -21,7 +21,7 @@
 
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:textSize="12sp"
+                      android:textSize="14sp"
                       android:textColor="@color/doorhanger_text"
                       android:text="@string/identity_connected_to"/>
 
@@ -32,7 +32,7 @@
 
             <TextView android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:textSize="12sp"
+                      android:textSize="14sp"
                       android:textColor="@color/doorhanger_text"
                       android:text="@string/identity_run_by"
                       android:paddingTop="12dip"/>
@@ -45,7 +45,7 @@
             <TextView android:id="@+id/verifier"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      android:textSize="12sp"
+                      android:textSize="14sp"
                       android:textColor="@color/doorhanger_text"
                       android:paddingTop="12dip"/>
 
diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml
index 3d3db8793c2..6fe782d2c30 100644
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -361,7 +361,7 @@
       <item name="android:paddingBottom">1dip</item>
       <item name="android:paddingLeft">5dip</item>
       <item name="android:paddingRight">5dip</item>
-      <item name="android:textSize">10sp</item>
+      <item name="android:textSize">12sp</item>
       <item name="android:gravity">center|left</item>
     </style>
 
@@ -389,7 +389,7 @@
     <style name="AboutHome.LastTabRow" />
 
     <style name="AboutHome.LastTabRow.Title">
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">16sp</item>
         <item name="android:singleLine">true</item>
         <item name="android:textColor">@color/abouthome_section_title</item>
     </style>