Bug 1393174 - Rename FirstrunRegular.Link to Link. r?mcomella draft
authorChenxia Liu <liuche@mozilla.com>
Thu, 14 Sep 2017 17:59:28 -0700
changeset 665753 37399dd3877440c09e8f5bdbc1bb4658b48271d4
parent 665752 aecf85eed6e65d810dde4b7afdaa54b3ad4b6075
child 731867 061caa02b8300b91cff62239ae436485defefac1
push id80157
push usercliu@mozilla.com
push dateFri, 15 Sep 2017 21:51:19 +0000
reviewersmcomella
bugs1393174
milestone57.0a1
Bug 1393174 - Rename FirstrunRegular.Link to Link. r?mcomella MozReview-Commit-ID: 6UEGfBcdB1M
mobile/android/app/src/main/res/layout/activity_stream_main_highlightstitle.xml
mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
mobile/android/app/src/main/res/layout/firstrun_sync_fragment.xml
mobile/android/app/src/main/res/layout/restricted_firstrun_welcome_fragment.xml
mobile/android/app/src/photon/res/values/styles.xml
--- a/mobile/android/app/src/main/res/layout/activity_stream_main_highlightstitle.xml
+++ b/mobile/android/app/src/main/res/layout/activity_stream_main_highlightstitle.xml
@@ -24,17 +24,17 @@
         android:id="@+id/title_link"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:paddingStart="0dp"
         android:paddingLeft="0dp"
         android:paddingEnd="@dimen/activity_stream_base_margin"
         android:paddingRight="@dimen/activity_stream_base_margin"
-        android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
+        android:textAppearance="@style/TextAppearance.Link"
         android:textAllCaps="true"
         android:visibility="gone"/>
 
     <ImageView
         android:id="@+id/arrow_link"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_marginEnd="@dimen/activity_stream_base_margin"
--- a/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
+++ b/mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml
@@ -46,13 +46,13 @@
                   android:layout_weight="1"
                   android:visibility="invisible"/>
 
         <TextView android:id="@+id/firstrun_link"
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_marginBottom="30dp"
                   android:gravity="center"
-                  android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"
+                  android:textAppearance="@style/TextAppearance.Link"
                   android:textAllCaps="true"
                   android:text="@string/firstrun_button_next"/>
     </LinearLayout>
 </ScrollView>
--- a/mobile/android/app/src/main/res/layout/firstrun_sync_fragment.xml
+++ b/mobile/android/app/src/main/res/layout/firstrun_sync_fragment.xml
@@ -58,13 +58,13 @@
                 android:id="@+id/welcome_browse"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
                 android:layout_marginBottom="30dp"
                 android:text="@string/firstrun_welcome_button_browser"
                 android:textAllCaps="true"
-                android:textAppearance="@style/TextAppearance.FirstrunRegular.Link"/>
+                android:textAppearance="@style/TextAppearance.Link"/>
         </RelativeLayout>
 
     </LinearLayout>
 </ScrollView>
--- a/mobile/android/app/src/main/res/layout/restricted_firstrun_welcome_fragment.xml
+++ b/mobile/android/app/src/main/res/layout/restricted_firstrun_welcome_fragment.xml
@@ -61,14 +61,14 @@
 
             <TextView
                 android:id="@+id/learn_more_link"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
                 android:padding="20dp"
                 android:text="@string/pref_learn_more"
-                android:textAppearance="@style/TextAppearance.FirstrunRegular.Link" />
+                android:textAppearance="@style/TextAppearance.Link" />
 
         </LinearLayout>
     </LinearLayout>
 
 </ScrollView>
--- a/mobile/android/app/src/photon/res/values/styles.xml
+++ b/mobile/android/app/src/photon/res/values/styles.xml
@@ -743,17 +743,17 @@
     </style>
 
     <style name="TextAppearance.FirstrunRegular.Body">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/ob_subtitle</item>
         <item name="android:lineSpacingMultiplier">1.25</item>
     </style>
 
-    <style name="TextAppearance.FirstrunRegular.Link">
+    <style name="TextAppearance.Link">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/ob_click</item>
     </style>
 
     <!-- Remote Tabs home panel -->
     <style name="RemoteTabsPanelFrame">
         <item name="android:paddingLeft">32dp</item>
         <item name="android:paddingStart">32dp</item>