Bug 1148041 - Have the ShareOverlay text styles inherit from the default TextAppearance. r=liuche a=sylvestre
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 26 Mar 2015 12:06:24 -0700
changeset 258358 0442cb68ed69
parent 258357 e399294c9df3
child 258359 0db186d2534c
push id4649
push usermichael.l.comella@gmail.com
push date2015-04-08 16:29 +0000
treeherdermozilla-beta@0db186d2534c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche, sylvestre
bugs1148041
milestone38.0
Bug 1148041 - Have the ShareOverlay text styles inherit from the default TextAppearance. r=liuche 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,17 +7,17 @@
     <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"
+        android:textAppearance="@style/TextAppearance.ShareOverlay"
         android:id="@+id/overlaybtn_label"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="false"
         android:enabled="false"
         android:maxLines="1"
         android:textSize="14sp"
         android:textColor="@color/primary_text_selector"/>
--- a/mobile/android/base/resources/layout/overlay_share_dialog.xml
+++ b/mobile/android/base/resources/layout/overlay_share_dialog.xml
@@ -20,29 +20,29 @@
         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"
+            android:textAppearance="@style/TextAppearance.ShareOverlay.Header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             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"
+            android:textAppearance="@style/TextAppearance.ShareOverlay.Header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="20dp"
             android:textSize="12sp"
             android:scrollHorizontally="true"/>
 
         <!-- TODO: Add back drop shadow (bug 1146488)? -->
         <!-- Buttons -->
--- a/mobile/android/base/resources/values/styles.xml
+++ b/mobile/android/base/resources/values/styles.xml
@@ -777,21 +777,21 @@
     </style>
 
     <style name="ShareOverlayTitle">
         <item name="android:gravity">center_horizontal</item>
         <item name="android:paddingLeft">15dp</item>
         <item name="android:paddingRight">15dp</item>
     </style>
 
-    <style name="ShareOverlayTextAppearance">
+    <style name="TextAppearance.ShareOverlay">
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
-    <style name="ShareOverlayTextAppearance.Header">
+    <style name="TextAppearance.ShareOverlay.Header">
         <item name="android:textColor">@android:color/white</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>