Bug 1130203 - Review: Remove single use styles in share overlay. r=trivial
authorMichael Comella <michael.l.comella@gmail.com>
Mon, 23 Mar 2015 11:25:17 -0700
changeset 265841 4000ac847fc7d7521585b19bbebe858ac82b66db
parent 265840 8c3212c240bc88356e454109c60a8f31426a7b6f
child 265842 b3901be2155dc72f8dbac5ad7cf3d9f5fa61f0a9
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)
reviewerstrivial
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 - Review: Remove single use styles in share overlay. r=trivial
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
@@ -787,33 +787,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>