Bug 1148041 - Have the ShareOverlay text styles inherit from the default TextAppearance. r=liuche
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 26 Mar 2015 12:06:24 -0700
changeset 266187 37c1fdfd86ba15b53dca42be7c55a8ba5c74407b
parent 266186 ad9f9f565c3947ddf871acc2392709b32ac78de2
child 266188 b078b546a896d3656428d7a5c76469471149c8d7
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)
reviewersliuche
bugs1148041
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 1148041 - Have the ShareOverlay text styles inherit from the default TextAppearance. r=liuche
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
@@ -779,21 +779,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>