Bug 1150742 - Remove new_tablet prefix from color resources. r=mhaigh
authorMichael Comella <michael.l.comella@gmail.com>
Thu, 06 Aug 2015 17:23:10 -0700
changeset 257608 f70b3993f1047d65e130c82ac222c093989f0da7
parent 257607 b6e425c6a777507017c4d2f4cd4922b44496a1d8
child 257609 cf92c63365bc538804f8fd05eb1866574f998202
push id14649
push usermichael.l.comella@gmail.com
push dateThu, 13 Aug 2015 17:29:23 +0000
treeherderfx-team@03b4d313d6d6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmhaigh
bugs1150742
milestone43.0a1
Bug 1150742 - Remove new_tablet prefix from color resources. r=mhaigh
mobile/android/base/resources/color-large-v11/new_tablet_tab_item_title.xml
mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_bg.xml
mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
mobile/android/base/resources/color-large-v11/tab_item_title.xml
mobile/android/base/resources/color-large-v11/tab_strip_item_bg.xml
mobile/android/base/resources/color-large-v11/tab_strip_item_title.xml
mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
mobile/android/base/resources/layout-v11/new_tablet_tabs_item_cell.xml
mobile/android/base/tabs/TabStripItemView.java
rename from mobile/android/base/resources/color-large-v11/new_tablet_tab_item_title.xml
rename to mobile/android/base/resources/color-large-v11/tab_item_title.xml
rename from mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_bg.xml
rename to mobile/android/base/resources/color-large-v11/tab_strip_item_bg.xml
rename from mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
rename to mobile/android/base/resources/color-large-v11/tab_strip_item_title.xml
--- a/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
+++ b/mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
@@ -18,17 +18,17 @@
         android:id="@+id/title"
         android:layout_width="0dip"
         android:layout_height="match_parent"
         android:layout_weight="1.0"
         android:layout_marginRight="-5dp"
         android:gravity="center_vertical"
         android:textSize="14sp"
         android:ellipsize="end"
-        android:textColor="@color/new_tablet_tab_strip_item_title"
+        android:textColor="@color/tab_strip_item_title"
         android:maxLines="1"
         gecko:fadeWidth="30dip"
         android:duplicateParentState="true"/>
 
     <org.mozilla.gecko.widget.ThemedImageButton
         android:id="@+id/audio_playing"
         android:visibility="gone"
         android:layout_width="20dip"
--- a/mobile/android/base/resources/layout-v11/new_tablet_tabs_item_cell.xml
+++ b/mobile/android/base/resources/layout-v11/new_tablet_tabs_item_cell.xml
@@ -22,17 +22,17 @@
 
        <org.mozilla.gecko.widget.FadedSingleColorTextView
                android:id="@+id/title"
                android:layout_width="0dip"
                android:layout_height="wrap_content"
                android:layout_weight="1.0"
                style="@style/TabLayoutItemTextAppearance"
                android:textSize="14sp"
-               android:textColor="@color/new_tablet_tab_item_title"
+               android:textColor="@color/tab_item_title"
                android:singleLine="true"
                android:duplicateParentState="true"
                gecko:fadeWidth="15dp"
                android:paddingRight="5dp"/>
 
           <ImageButton android:id="@+id/audio_playing"
                        android:visibility="gone"
                        android:layout_width="20dip"
--- a/mobile/android/base/tabs/TabStripItemView.java
+++ b/mobile/android/base/tabs/TabStripItemView.java
@@ -68,17 +68,17 @@ public class TabStripItemView extends Th
         setOrientation(HORIZONTAL);
 
         tabRegion = new Region();
         tabClipRegion = new Region();
 
         final Resources res = context.getResources();
 
         final ColorStateList tabColors =
-                res.getColorStateList(R.color.new_tablet_tab_strip_item_bg);
+                res.getColorStateList(R.color.tab_strip_item_bg);
         backgroundDrawable = new ResizablePathDrawable(new TabCurveShape(), tabColors);
         setBackgroundDrawable(backgroundDrawable);
 
         faviconSize = res.getDimensionPixelSize(R.dimen.browser_toolbar_favicon_size);
 
         LayoutInflater.from(context).inflate(R.layout.tab_strip_item_view, this);
         setOnClickListener(new View.OnClickListener() {
             @Override