Bug 1130203 - Move share overlay title styles into styles.xml and revise to match mocks. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 26 Feb 2015 17:33:36 -0800
changeset 265826 ba4e9c9171996dadc76d330d01588863ba54bc0c
parent 265825 b29f773bd048f64662701f791c88b8076540c028
child 265827 1c34fab43fa42993cce29b55856b55d262e9887a
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1130203
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1130203 - Move share overlay title styles into styles.xml and revise to match mocks. r=mhaigh
mobile/android/base/resources/layout/overlay_share_dialog.xml
mobile/android/base/resources/values/styles.xml
--- a/mobile/android/base/resources/layout/overlay_share_dialog.xml
+++ b/mobile/android/base/resources/layout/overlay_share_dialog.xml
@@ -20,35 +20,35 @@
         android:layout_gravity="bottom|center"
         android:paddingTop="8dp"
         android:orientation="vertical">
 
         <!-- Title -->
         <TextView
             android:id="@+id/title"
             style="@style/ShareOverlayTitle"
+            android:textAppearance="@style/TextAppearance.ShareOverlay.Title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:scrollHorizontally="true"
-            android:textSize="24sp"/>
+            android:layout_marginBottom="8dp"/>
 
         <!-- Subtitle (url) -->
         <TextView
             android:id="@+id/subtitle"
             style="@style/ShareOverlayTitle"
+            android:textAppearance="@style/TextAppearance.ShareOverlay.Subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
 
         <!-- TODO: Add back drop shadow? -->
         <!-- Buttons -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
             android:background="@color/overlay_share_background"
             android:orientation="vertical">
 
             <!-- TODO: Once API 11 is available, stick "showDividers=middle" into the parent and get rid
                        of these evil separator views. -->
 
             <!-- "Send to Firefox Sync" -->
             <org.mozilla.gecko.overlays.ui.SendTabList
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -775,22 +775,36 @@
     <style name="GeckoActionBar.Buttons">
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textColor">@color/placeholder_active_grey</item>
         <item name="android:gravity">right</item>
     </style>
 
     <style name="ShareOverlayTitle">
         <item name="android:gravity">center_horizontal</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:paddingBottom">18dp</item>
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>
     </style>
 
+    <style name="TextAppearance.ShareOverlay">
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:fontFamily">sans-serif</item>
+    </style>
+
+    <style name="TextAppearance.ShareOverlay.Title">
+        <item name="android:textSize">20sp</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="TextAppearance.ShareOverlay.Subtitle">
+        <item name="android:textSize">12sp</item>
+        <item name="android:scrollHorizontally">true</item>
+    </style>
+
     <!-- TODO: Clean up this and inherited styles. -->
     <style name="ShareOverlayButton">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">60dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>