Bug 1130203 - Review: Remove single use styles in share overlay. r=trivial a=sylvestre
authorMichael Comella <michael.l.comella@gmail.com>
Mon, 23 Mar 2015 11:25:17 -0700
changeset 258352 ce7199dbb0af
parent 258351 dd5f8068b392
child 258353 dcadb3572692
push id4648
push usermichael.l.comella@gmail.com
push date2015-04-08 16:26 +0000
treeherdermozilla-beta@e399294c9df3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstrivial, sylvestre
bugs1130203
milestone38.0
Bug 1130203 - Review: Remove single use styles in share overlay. r=trivial a=sylvestre
mobile/android/base/resources/layout/overlay_share_button.xml
mobile/android/base/resources/layout/overlay_share_dialog.xml
mobile/android/base/resources/values/styles.xml
--- a/mobile/android/base/resources/layout/overlay_share_button.xml
+++ b/mobile/android/base/resources/layout/overlay_share_button.xml
@@ -7,15 +7,18 @@
     <ImageView
         android:layout_width="60dp"
         android:layout_height="match_parent"
         android:id="@+id/overlaybtn_icon"
         android:padding="30dp"
         android:scaleType="center"/>
 
     <TextView
-        android:textAppearance="@style/ShareOverlayTextAppearance.Button"
+        android:textAppearance="@style/ShareOverlayTextAppearance"
         android:id="@+id/overlaybtn_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="false"
-        android:enabled="false"/>
+        android:enabled="false"
+        android:maxLines="1"
+        android:textSize="14sp"
+        android:textColor="@color/primary_text_selector"/>
 </merge>
--- a/mobile/android/base/resources/layout/overlay_share_dialog.xml
+++ b/mobile/android/base/resources/layout/overlay_share_dialog.xml
@@ -20,29 +20,34 @@
         android:layout_gravity="bottom|center"
         android:paddingTop="8dp"
         android:orientation="vertical">
 
         <!-- Title -->
         <TextView
             android:id="@+id/title"
             style="@style/ShareOverlayTitle"
-            android:textAppearance="@style/ShareOverlayTextAppearance.Header.Title"
+            android:textAppearance="@style/ShareOverlayTextAppearance.Header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"/>
+            android:layout_marginBottom="8dp"
+            android:maxLines="2"
+            android:textSize="20sp"
+            android:ellipsize="end"/>
 
         <!-- Subtitle (url) -->
         <TextView
             android:id="@+id/subtitle"
             style="@style/ShareOverlayTitle"
-            android:textAppearance="@style/ShareOverlayTextAppearance.Header.Subtitle"
+            android:textAppearance="@style/ShareOverlayTextAppearance.Header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"/>
+            android:layout_marginBottom="20dp"
+            android:textSize="12sp"
+            android:scrollHorizontally="true"/>
 
         <!-- TODO: Add back drop shadow? -->
         <!-- Buttons -->
         <!-- "Send to Firefox Sync" -->
         <org.mozilla.gecko.overlays.ui.SendTabList
             android:id="@+id/overlay_send_tab_btn"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -785,33 +785,16 @@
     <style name="ShareOverlayTextAppearance">
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
     <style name="ShareOverlayTextAppearance.Header">
         <item name="android:textColor">@android:color/white</item>
     </style>
 
-    <style name="ShareOverlayTextAppearance.Header.Title">
-        <item name="android:textSize">20sp</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="ShareOverlayTextAppearance.Header.Subtitle">
-        <item name="android:textSize">12sp</item>
-        <item name="android:scrollHorizontally">true</item>
-    </style>
-
-    <style name="ShareOverlayTextAppearance.Button">
-        <item name="android:maxLines">1</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/primary_text_selector</item>
-    </style>
-
     <style name="ShareOverlayRow">
         <item name="android:minHeight">60dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:background">@drawable/overlay_share_button_background</item>
         <item name="android:focusableInTouchMode">false</item>
     </style>
 
     <style name="TabInput"></style>