Bug 838735: Remove transparency from inactive tabs. [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Thu, 07 Feb 2013 12:35:03 -0800
changeset 131110 c0ae5b372d217ad2f5e4cb5e9ff2ef4dc8ab9693
parent 131109 92baddca12ba466b56f1007e2530800e4706df4d
child 131111 51ef9db638f01cfa5014ae999b9a63640c6a60f0
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs838735
milestone21.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 838735: Remove transparency from inactive tabs. [r=mfinkle]
mobile/android/base/Makefile.in
mobile/android/base/TabsTray.java
mobile/android/base/resources/color/tab_title.xml
mobile/android/base/resources/layout/tabs_row.xml
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -1031,17 +1031,16 @@ RES_DRAWABLE_XLARGE_XHDPI_V11 = \
   res/drawable-xlarge-xhdpi-v11/tabs_carat_contracted.png \
   res/drawable-xlarge-xhdpi-v11/tabs_carat_expanded.png \
   res/drawable-xlarge-xhdpi-v11/tabs_menu.png \
   $(NULL)
 
 RES_COLOR = \
   res/color/menu_item_title.xml \
   res/color/select_item_multichoice.xml \
-  res/color/tab_title.xml \
   $(NULL)
 
 RES_MENU = \
   res/menu/awesomebar_contextmenu.xml \
   res/menu/gecko_app_menu.xml \
   res/menu/tabs_menu.xml \
   res/menu/titlebar_contextmenu.xml \
   res/menu/abouthome_topsites_contextmenu.xml \
--- a/mobile/android/base/TabsTray.java
+++ b/mobile/android/base/TabsTray.java
@@ -236,21 +236,16 @@ public class TabsTray extends ListView
             Drawable thumbnailImage = tab.getThumbnail();
             if (thumbnailImage != null)
                 row.thumbnail.setImageDrawable(thumbnailImage);
             else if (TextUtils.equals(tab.getURL(), ABOUT_HOME))
                 row.thumbnail.setImageResource(R.drawable.abouthome_thumbnail);
             else
                 row.thumbnail.setImageResource(R.drawable.tab_thumbnail_default);
 
-            if (Tabs.getInstance().isSelectedTab(tab))
-                row.thumbnail.setAlpha(255);
-            else
-                row.thumbnail.setAlpha(179);
-
             row.title.setText(tab.getDisplayTitle());
         }
 
         public View getView(int position, View convertView, ViewGroup parent) {
             TabRow row;
 
             if (convertView == null) {
                 convertView = mInflater.inflate(R.layout.tabs_row, null);
deleted file mode 100644
--- a/mobile/android/base/resources/color/tab_title.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true"
-          android:color="#FFFFFFFF"/>
-
-    <item android:state_checked="false"
-          android:color="#FFCBCBCB"/>
-
-</selector>
--- a/mobile/android/base/resources/layout/tabs_row.xml
+++ b/mobile/android/base/resources/layout/tabs_row.xml
@@ -29,15 +29,15 @@
     <TextView android:id="@+id/title"
               android:layout_width="0dip"
               android:layout_height="fill_parent"
               android:layout_weight="1.0"
               android:paddingTop="4dip"
               android:paddingLeft="8dip"
               android:paddingRight="4dip"
               style="@style/TabRowTextAppearance"
-              android:textColor="@color/tab_title"
+              android:textColor="#FFFFFFFF"
               android:textSize="14sp"
               android:singleLine="false"
               android:maxLines="4"
               android:duplicateParentState="true"/>
 
 </Gecko.TabRow>