Bug 840346: Flat URL bar. [r=mfinkle]

--HG--
extra : rebase_source : 25e8b78e6ef97e3bb1e0ccb701bd98d9d1b24e4c

mobile/android/base/AboutHomeContent.java

@@ -761,7 +761,7 @@ public class AboutHomeContent extends ScrollView
 
     @Override
     public void onLightweightThemeReset() {
-        setBackgroundResource(R.drawable.abouthome_bg_repeat);
+        setBackgroundColor(getContext().getResources().getColor(R.color.background_normal));
 
         if (mAddons != null) {
             mAddons.resetTheme();

mobile/android/base/AwesomeBarTabs.java

@@ -6,6 +6,7 @@
 package org.mozilla.gecko;
 
 import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.StateListDrawable;
 import android.support.v4.view.ViewPager;
 import android.support.v4.view.PagerAdapter;
@@ -362,7 +363,7 @@ public class AwesomeBarTabs extends TabHost
             drawable.setAlpha(255, 0);
 
             StateListDrawable stateList = new StateListDrawable();
-            stateList.addState(new int[] { R.attr.state_private }, mActivity.getResources().getDrawable(R.drawable.abouthome_bg_pb_repeat));
+            stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(mActivity.getResources().getColor(R.color.background_normal)));
             stateList.addState(new int[] {}, drawable);
 
             int[] padding =  new int[] { getPaddingLeft(),
@@ -381,7 +382,7 @@ public class AwesomeBarTabs extends TabHost
                                          getPaddingRight(),
                                          getPaddingBottom()
                                        };
-            setBackgroundResource(R.drawable.awesomebar_tabs_bg);
+            setBackgroundResource(R.drawable.address_bar_bg);
             setPadding(padding[0], padding[1], padding[2], padding[3]);
         }
 

mobile/android/base/BackButton.java

@@ -12,6 +12,7 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.Shader;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.util.AttributeSet;
@@ -54,12 +55,12 @@ public class BackButton extends ShapedButton {
 
         mBorderPaint.setShader(new LinearGradient(0, 0, 
                                                   0, height, 
-                                                  0xFF898D8F, 0xFFFEFEFE,
+                                                  0xFFB5BBC1, 0xFFFAFBFC,
                                                   Shader.TileMode.CLAMP));
 
         mBorderPrivatePaint.setShader(new LinearGradient(0, 0, 
                                                          0, height, 
-                                                         0xCC06090D, 0xFF616569,
+                                                         0xFF040607, 0xFF0B0D0E,
                                                          Shader.TileMode.CLAMP));
     }
 
@@ -82,7 +83,7 @@ public class BackButton extends ShapedButton {
         StateListDrawable stateList = new StateListDrawable();
 
         stateList.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.highlight));
-        stateList.addState(new int[] { R.attr.state_private }, resources.getDrawable(R.drawable.address_bar_bg_private));
+        stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(resources.getColor(R.color.background_private)));
         stateList.addState(new int[] {}, drawable);
 
         setBackgroundDrawable(stateList);

mobile/android/base/BrowserToolbar.java

@@ -8,6 +8,7 @@ package org.mozilla.gecko;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.AnimationDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.graphics.Rect;
@@ -1231,7 +1232,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
                 return;
 
             StateListDrawable stateList = new StateListDrawable();
-            stateList.addState(new int[] { R.attr.state_private }, mActivity.getResources().getDrawable(R.drawable.address_bar_bg_private));
+            stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(mActivity.getResources().getColor(R.color.background_private)));
             stateList.addState(new int[] {}, drawable);
 
             int[] padding =  new int[] { getPaddingLeft(),

mobile/android/base/BrowserToolbarBackground.java

@@ -9,6 +9,7 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Path;
 import android.graphics.PorterDuff.Mode;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.util.AttributeSet;
@@ -99,7 +100,7 @@ public class BrowserToolbarBackground extends GeckoLinearLayout
             return;
 
         StateListDrawable stateList = new StateListDrawable();
-        stateList.addState(new int[] { R.attr.state_private }, mActivity.getResources().getDrawable(R.drawable.address_bar_bg_private));
+        stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(mActivity.getResources().getColor(R.color.background_private)));
         stateList.addState(new int[] {}, drawable);
 
         int[] padding =  new int[] { getPaddingLeft(),

mobile/android/base/ForwardButton.java

@@ -11,6 +11,7 @@ import android.graphics.LinearGradient;
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.Shader;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.StateListDrawable;
 import android.util.AttributeSet;
@@ -48,12 +49,12 @@ public class ForwardButton extends ShapedButton {
 
         mBorderPaint.setShader(new LinearGradient(0, 0, 
                                                   0, height, 
-                                                  0xFF898D8F, 0xFFFEFEFE,
+                                                  0xFFB5BBC1, 0xFFFAFBFC,
                                                   Shader.TileMode.CLAMP));
 
         mBorderPrivatePaint.setShader(new LinearGradient(0, 0, 
                                                          0, height, 
-                                                         0xCC06090D, 0xFF616569,
+                                                         0xFF040607, 0xFF0B0D0E,
                                                          Shader.TileMode.CLAMP));
     }
 
@@ -76,7 +77,7 @@ public class ForwardButton extends ShapedButton {
         StateListDrawable stateList = new StateListDrawable();
 
         stateList.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.highlight));
-        stateList.addState(new int[] { R.attr.state_private }, resources.getDrawable(R.drawable.address_bar_bg_private));
+        stateList.addState(new int[] { R.attr.state_private }, new ColorDrawable(resources.getColor(R.color.background_private)));
         stateList.addState(new int[] {}, drawable);
 
         setBackgroundDrawable(stateList);

mobile/android/base/LightweightThemeDrawable.java

@@ -93,28 +93,8 @@ public class LightweightThemeDrawable extends Drawable {
      * @param textureId The resource if of the texture.
      */
     public void setTexture(int textureId) {
-        Shader.TileMode modeX = Shader.TileMode.REPEAT;
-        Shader.TileMode modeY = Shader.TileMode.REPEAT;
-
-        // The texture to be repeated.
-        Bitmap texture = BitmapFactory.decodeResource(mResources, textureId);
-
-        if (texture == null) {
-            // Texture may be used inside a BitmapDrawable.
-            Drawable drawable = mResources.getDrawable(textureId);
-            if (drawable != null && drawable instanceof BitmapDrawable) {
-                BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
-                texture = bitmapDrawable.getBitmap();
-                modeX = bitmapDrawable.getTileModeX();
-                modeY = bitmapDrawable.getTileModeY();
-            }
-        }
-
-        // Set the shader for the texture paint.
-        if (texture != null) {
-            mTexturePaint = new Paint(mPaint);
-            mTexturePaint.setShader(new BitmapShader(texture, modeX, modeY));
-        }
+        mTexturePaint = new Paint(mPaint);
+        mTexturePaint.setColor(mResources.getColor(textureId));
     }
 
     /**

mobile/android/base/Makefile.in

@@ -250,7 +250,6 @@ FENNEC_PP_XML_FILES = \
   res/drawable/address_bar_bg.xml \
   res/drawable/address_bar_nav_button.xml \
   res/drawable/address_bar_url.xml \
-  res/drawable/awesomebar_tabs_bg.xml \
   res/drawable/menu_level.xml \
   res/layout/abouthome_content.xml \
   res/layout/awesomebar_search.xml \
@@ -510,9 +509,6 @@ RES_ANIM = \
 
 RES_DRAWABLE_NODPI = \
   res/drawable-nodpi/abouthome_bg.png \
-  res/drawable-nodpi/abouthome_bg_pb.png \
-  res/drawable-nodpi/tabs_tray_bg.png \
-  res/drawable-nodpi/tabs_tray_dark_bg.png \
   $(NULL)
 
 RES_DRAWABLE_BASE = \
@@ -569,8 +565,6 @@ RES_DRAWABLE_BASE = \
   res/drawable/tab_thumbnail_default.png \
   res/drawable/tab_thumbnail_shadow.png \
   res/drawable/tabs_carat.png \
-  res/drawable/address_bar_texture_port.png \
-  res/drawable/address_bar_texture_port_pb.png \
   res/drawable/address_bar_url_default.9.png \
   res/drawable/address_bar_url_default_pb.9.png \
   res/drawable/address_bar_url_pressed.9.png \
@@ -669,8 +663,6 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/tab_thumbnail_default.png \
   res/drawable-hdpi/tab_thumbnail_shadow.png \
   res/drawable-hdpi/tabs_carat.png \
-  res/drawable-hdpi/address_bar_texture_port.png \
-  res/drawable-hdpi/address_bar_texture_port_pb.png \
   res/drawable-hdpi/address_bar_url_default.9.png \
   res/drawable-hdpi/address_bar_url_default_pb.9.png \
   res/drawable-hdpi/address_bar_url_pressed.9.png \
@@ -724,8 +716,6 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/abouthome_thumbnail_bg.png \
   res/drawable-xhdpi/abouthome_thumbnail_add.png \
   res/drawable-xhdpi/address_bar_bg_shadow.png \
-  res/drawable-xhdpi/address_bar_texture_port.png \
-  res/drawable-xhdpi/address_bar_texture_port_pb.png \
   res/drawable-xhdpi/address_bar_url_default.9.png \
   res/drawable-xhdpi/address_bar_url_default_pb.9.png \
   res/drawable-xhdpi/address_bar_url_pressed.9.png \
@@ -875,56 +865,25 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/ic_status_logo.png \
   $(NULL)
 
-RES_DRAWABLE_LAND_V14 = \
-  res/drawable-land-v14/address_bar_bg_normal.xml \
-  res/drawable-land-v14/address_bar_bg_private.xml \
-  $(NULL)
-
 RES_DRAWABLE_LAND_MDPI_V14 = \
-  res/drawable-land-mdpi-v14/address_bar_texture_land.png \
-  res/drawable-land-mdpi-v14/address_bar_texture_land_pb.png \
-  res/drawable-land-mdpi-v14/address_bar_url_default.9.png \
-  res/drawable-land-mdpi-v14/address_bar_url_default_pb.9.png \
-  res/drawable-land-mdpi-v14/address_bar_url_pressed.9.png \
-  res/drawable-land-mdpi-v14/address_bar_url_pressed_pb.9.png \
   res/drawable-land-mdpi-v14/remote_tabs_off.png \
   res/drawable-land-mdpi-v14/remote_tabs_on.png \
   res/drawable-land-mdpi-v14/tabs_carat.png \
   $(NULL)
 
 RES_DRAWABLE_LAND_HDPI_V14 = \
-  res/drawable-land-hdpi-v14/address_bar_texture_land.png \
-  res/drawable-land-hdpi-v14/address_bar_texture_land_pb.png \
-  res/drawable-land-hdpi-v14/address_bar_url_default.9.png \
-  res/drawable-land-hdpi-v14/address_bar_url_default_pb.9.png \
-  res/drawable-land-hdpi-v14/address_bar_url_pressed.9.png \
-  res/drawable-land-hdpi-v14/address_bar_url_pressed_pb.9.png \
   res/drawable-land-hdpi-v14/remote_tabs_off.png \
   res/drawable-land-hdpi-v14/remote_tabs_on.png \
   res/drawable-land-hdpi-v14/tabs_carat.png \
   $(NULL)
 
 RES_DRAWABLE_LAND_XHDPI_V14 = \
-  res/drawable-land-xhdpi-v14/address_bar_texture_land.png \
-  res/drawable-land-xhdpi-v14/address_bar_texture_land_pb.png \
-  res/drawable-land-xhdpi-v14/address_bar_url_default.9.png \
-  res/drawable-land-xhdpi-v14/address_bar_url_default_pb.9.png \
-  res/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png \
-  res/drawable-land-xhdpi-v14/address_bar_url_pressed_pb.9.png \
   res/drawable-land-xhdpi-v14/remote_tabs_off.png \
   res/drawable-land-xhdpi-v14/remote_tabs_on.png \
   res/drawable-land-xhdpi-v14/tabs_carat.png \
   $(NULL)
 
 RES_DRAWABLE_LARGE_MDPI_V11 = \
-  res/drawable-large-mdpi-v11/address_bar_bg_normal.xml \
-  res/drawable-large-mdpi-v11/address_bar_bg_private.xml \
-  res/drawable-large-mdpi-v11/address_bar_texture_tablet.png \
-  res/drawable-large-mdpi-v11/address_bar_texture_tablet_pb.png \
-  res/drawable-large-mdpi-v11/address_bar_url_default.9.png \
-  res/drawable-large-mdpi-v11/address_bar_url_default_pb.9.png \
-  res/drawable-large-mdpi-v11/address_bar_url_pressed.9.png \
-  res/drawable-large-mdpi-v11/address_bar_url_pressed_pb.9.png \
   res/drawable-large-mdpi-v11/ic_menu_reload.png \
   res/drawable-large-mdpi-v11/ic_menu_forward.png \
   res/drawable-large-mdpi-v11/remote_tabs_off.png \
@@ -933,12 +892,6 @@ RES_DRAWABLE_LARGE_MDPI_V11 = \
   $(NULL)
 
 RES_DRAWABLE_LARGE_HDPI_V11 = \
-  res/drawable-large-hdpi-v11/address_bar_texture_tablet.png \
-  res/drawable-large-hdpi-v11/address_bar_texture_tablet_pb.png \
-  res/drawable-large-hdpi-v11/address_bar_url_default.9.png \
-  res/drawable-large-hdpi-v11/address_bar_url_default_pb.9.png \
-  res/drawable-large-hdpi-v11/address_bar_url_pressed.9.png \
-  res/drawable-large-hdpi-v11/address_bar_url_pressed_pb.9.png \
   res/drawable-large-hdpi-v11/ic_menu_reload.png \
   res/drawable-large-hdpi-v11/ic_menu_forward.png \
   res/drawable-large-hdpi-v11/remote_tabs_off.png \
@@ -947,12 +900,6 @@ RES_DRAWABLE_LARGE_HDPI_V11 = \
   $(NULL)
 
 RES_DRAWABLE_LARGE_XHDPI_V11 = \
-  res/drawable-large-xhdpi-v11/address_bar_texture_tablet.png \
-  res/drawable-large-xhdpi-v11/address_bar_texture_tablet_pb.png \
-  res/drawable-large-xhdpi-v11/address_bar_url_default.9.png \
-  res/drawable-large-xhdpi-v11/address_bar_url_default_pb.9.png \
-  res/drawable-large-xhdpi-v11/address_bar_url_pressed.9.png \
-  res/drawable-large-xhdpi-v11/address_bar_url_pressed_pb.9.png \
   res/drawable-large-xhdpi-v11/ic_menu_reload.png \
   res/drawable-large-xhdpi-v11/ic_menu_forward.png \
   res/drawable-large-xhdpi-v11/remote_tabs_on.png \
@@ -1022,12 +969,8 @@ endif
 
 MOZ_ANDROID_DRAWABLES += \
   $(SYNC_RES_DRAWABLE)                                                          \
-  mobile/android/base/resources/drawable/abouthome_bg_repeat.xml                \
-  mobile/android/base/resources/drawable/abouthome_bg_pb_repeat.xml             \
   mobile/android/base/resources/drawable/abouthome_promo_box.xml                \
   mobile/android/base/resources/drawable/action_bar_button.xml                  \
-  mobile/android/base/resources/drawable/address_bar_bg_normal.xml              \
-  mobile/android/base/resources/drawable/address_bar_bg_private.xml             \
   mobile/android/base/resources/drawable/address_bar_bg_shadow_repeat.xml       \
   mobile/android/base/resources/drawable/autocomplete_list_bg.9.png             \
   mobile/android/base/resources/drawable/awesomebar_tab_indicator.xml           \
@@ -1064,8 +1007,6 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/tabs_button.xml                        \
   mobile/android/base/resources/drawable/tabs_level.xml                         \
   mobile/android/base/resources/drawable/tabs_panel_indicator.xml               \
-  mobile/android/base/resources/drawable/tabs_tray_bg_repeat.xml                \
-  mobile/android/base/resources/drawable/tabs_tray_dark_bg_repeat.xml           \
   mobile/android/base/resources/drawable/shadow.png                             \
   mobile/android/base/resources/drawable/marketplace.png                        \
   mobile/android/base/resources/drawable/webapp_titlebar_bg.xml                 \
@@ -1075,7 +1016,7 @@ MOZ_BRANDING_DRAWABLE_MDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRE
 MOZ_BRANDING_DRAWABLE_HDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-hdpi.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-hdpi.mn | tr '\n' ' ';  fi)
 MOZ_BRANDING_DRAWABLE_XHDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-xhdpi.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources-xhdpi.mn | tr '\n' ' ';  fi)
 
-RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_VALUES) $(RES_VALUES_LAND) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_V14) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
+RESOURCES=$(RES_LAYOUT) $(RES_LAYOUT_LARGE_V11) $(RES_LAYOUT_XLARGE_V11) $(RES_VALUES) $(RES_VALUES_LAND) $(RES_VALUES_V11) $(RES_VALUES_LARGE_V11) $(RES_VALUES_XLARGE_V11) $(RES_VALUES_LAND_V14) $(RES_XML) $(RES_ANIM) $(RES_DRAWABLE_NODPI) $(RES_DRAWABLE_BASE) $(RES_DRAWABLE_LDPI) $(RES_DRAWABLE_HDPI) $(RES_DRAWABLE_XHDPI) $(RES_DRAWABLE_MDPI_V11) $(RES_DRAWABLE_HDPI_V11) $(RES_DRAWABLE_XHDPI_V11) $(RES_DRAWABLE_LAND_MDPI_V14) $(RES_DRAWABLE_LAND_HDPI_V14) $(RES_DRAWABLE_LAND_XHDPI_V14) $(RES_DRAWABLE_LARGE_MDPI_V11) $(RES_DRAWABLE_LARGE_HDPI_V11) $(RES_DRAWABLE_LARGE_XHDPI_V11) $(RES_DRAWABLE_XLARGE_MDPI_V11) $(RES_DRAWABLE_XLARGE_HDPI_V11) $(RES_DRAWABLE_XLARGE_XHDPI_V11) $(RES_COLOR) $(RES_MENU)
 
 RES_DIRS= \
   res/layout                    \

mobile/android/base/TabsButton.java

@@ -160,8 +160,8 @@ public class TabsButton extends ShapedButton {
     // The drawable is constructed as per @drawable/tabs_button.
     @Override
     public void onLightweightThemeChanged() {
-        LightweightThemeDrawable lightWeight1 = mActivity.getLightweightTheme().getTextureDrawable(this, R.drawable.tabs_tray_bg_repeat);
-        LightweightThemeDrawable lightWeight2 = mActivity.getLightweightTheme().getTextureDrawable(this, R.drawable.tabs_tray_dark_bg_repeat);
+        LightweightThemeDrawable lightWeight1 = mActivity.getLightweightTheme().getTextureDrawable(this, R.color.background_tabs_light);
+        LightweightThemeDrawable lightWeight2 = mActivity.getLightweightTheme().getTextureDrawable(this, R.color.background_tabs_dark);
         if (lightWeight1 == null || lightWeight2 == null)
             return;
 
@@ -171,12 +171,12 @@ public class TabsButton extends ShapedButton {
         Resources resources = this.getContext().getResources();
         StateListDrawable stateList1 = new StateListDrawable();
         stateList1.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.highlight));
-        stateList1.addState(new int[] { R.attr.state_private }, resources.getDrawable(R.drawable.tabs_tray_bg_repeat));
+        stateList1.addState(new int[] { R.attr.state_private }, new ColorDrawable(resources.getColor(R.color.background_tabs_light)));
         stateList1.addState(new int[] {}, lightWeight1);
 
         StateListDrawable stateList2 = new StateListDrawable();
         stateList2.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.highlight));
-        stateList2.addState(new int[] { R.attr.state_private }, resources.getDrawable(R.drawable.tabs_tray_bg_repeat));
+        stateList2.addState(new int[] { R.attr.state_private }, new ColorDrawable(resources.getColor(R.color.background_tabs_dark)));
         stateList2.addState(new int[] {}, lightWeight2);
 
         LevelListDrawable levelList = new LevelListDrawable();

mobile/android/base/TabsPanel.java

@@ -205,7 +205,7 @@ public class TabsPanel extends LinearLayout
     
     @Override
     public void onLightweightThemeChanged() {
-        LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getTextureDrawable(this, R.drawable.tabs_tray_bg_repeat, true);
+        LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getTextureDrawable(this, R.color.background_tabs_light, true);
         if (drawable == null)
             return;
 
@@ -215,7 +215,7 @@ public class TabsPanel extends LinearLayout
 
     @Override
     public void onLightweightThemeReset() {
-        setBackgroundResource(R.drawable.tabs_tray_bg_repeat);
+        setBackgroundColor(getContext().getResources().getColor(R.color.background_tabs_light));
     }
 
     @Override
@@ -273,7 +273,7 @@ public class TabsPanel extends LinearLayout
     
         @Override
         public void onLightweightThemeChanged() {
-            LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getTextureDrawable(this, R.drawable.tabs_tray_dark_bg_repeat);
+            LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getTextureDrawable(this, R.color.background_tabs_dark);
             if (drawable == null)
                 return;
 
@@ -283,7 +283,7 @@ public class TabsPanel extends LinearLayout
 
         @Override
         public void onLightweightThemeReset() {
-            setBackgroundResource(R.drawable.tabs_tray_dark_bg_repeat);
+            setBackgroundColor(getContext().getResources().getColor(R.color.background_tabs_dark));
         }
 
         @Override

mobile/android/base/resources/drawable-land-v14/address_bar_bg_normal.xml

@@ -1,9 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/address_bar_texture_land"
-        android:tileMode="repeat"
-        android:dither="false"/>

mobile/android/base/resources/drawable-land-v14/address_bar_bg_private.xml

@@ -1,9 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/address_bar_texture_land_pb"
-        android:tileMode="repeat"
-        android:dither="false"/>

mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg_normal.xml

@@ -1,9 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/address_bar_texture_tablet"
-        android:tileMode="repeat"
-        android:dither="false"/>

mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg_private.xml

@@ -1,9 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/address_bar_texture_tablet_pb"
-        android:tileMode="repeat"
-        android:dither="false"/>

mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml

@@ -12,7 +12,7 @@
             <item android:state_pressed="true"
                   android:drawable="@drawable/highlight"/>
 
-            <item android:drawable="@drawable/tabs_tray_bg_repeat"/>
+            <item android:drawable="@color/background_tabs_light"/>
 
         </selector>
 
@@ -25,7 +25,7 @@
             <item android:state_pressed="true"
                   android:drawable="@drawable/highlight"/>
 
-            <item android:drawable="@drawable/tabs_tray_dark_bg_repeat"/>
+            <item android:drawable="@color/background_tabs_dark"/>
 
         </selector>
 

mobile/android/base/resources/drawable/abouthome_bg_pb_repeat.xml

@@ -1,8 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/abouthome_bg_pb"
-        android:tileMode="repeat"/>

mobile/android/base/resources/drawable/abouthome_bg_repeat.xml

@@ -1,8 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/abouthome_bg"
-        android:tileMode="repeat"/>

mobile/android/base/resources/drawable/address_bar_bg.xml.in

@@ -8,9 +8,9 @@
           xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
 
     <!-- private browsing mode -->
-    <item gecko:state_private="true" android:drawable="@drawable/address_bar_bg_private"/>
+    <item gecko:state_private="true" android:drawable="@color/background_private"/>
 
     <!-- normal mode -->
-    <item android:drawable="@drawable/address_bar_bg_normal"/>
+    <item android:drawable="@color/background_normal"/>
 
 </selector>

mobile/android/base/resources/drawable/address_bar_bg_normal.xml

@@ -1,9 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/address_bar_texture_port"
-        android:tileMode="repeat"
-        android:dither="false"/>

mobile/android/base/resources/drawable/address_bar_bg_private.xml

@@ -1,9 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/address_bar_texture_port_pb"
-        android:tileMode="repeat"
-        android:dither="false"/>

mobile/android/base/resources/drawable/address_bar_nav_button.xml.in

@@ -11,9 +11,9 @@
     <item android:state_pressed="true" android:drawable="@drawable/highlight"/>
 
     <!-- private browsing mode -->
-    <item gecko:state_private="true" android:drawable="@drawable/address_bar_bg_private"/>
+    <item gecko:state_private="true" android:drawable="@color/background_private"/>
 
     <!-- normal mode -->
-    <item android:drawable="@drawable/address_bar_bg_normal"/>
+    <item android:drawable="@color/background_normal"/>
 
 </selector>

mobile/android/base/resources/drawable/awesomebar_tabs_bg.xml.in

@@ -1,16 +0,0 @@
-#filter substitution
-<?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"
-          xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
-
-    <!-- private browsing mode -->
-    <item gecko:state_private="true" android:drawable="@drawable/abouthome_bg_pb_repeat"/>
-
-    <!-- normal mode -->
-    <item android:drawable="@drawable/abouthome_bg_repeat"/>
-
-</selector>

mobile/android/base/resources/drawable/tabs_button.xml

@@ -12,7 +12,7 @@
             <item android:state_pressed="true"
                   android:drawable="@drawable/highlight"/>
 
-            <item android:drawable="@drawable/tabs_tray_bg_repeat"/>
+            <item android:drawable="@color/background_tabs_light"/>
 
         </selector>
 

mobile/android/base/resources/drawable/tabs_tray_bg_repeat.xml

@@ -1,8 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/tabs_tray_bg"
-        android:tileMode="repeat"/>

mobile/android/base/resources/drawable/tabs_tray_dark_bg_repeat.xml

@@ -1,8 +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/. -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-        android:src="@drawable/tabs_tray_dark_bg"
-        android:tileMode="repeat"/>

mobile/android/base/resources/layout-xlarge-v11/gecko_app.xml.in

@@ -12,7 +12,7 @@
    <org.mozilla.gecko.TabsPanel android:id="@+id/tabs_panel"
                                 android:layout_width="200dip"
                                 android:layout_height="fill_parent"
-                                android:background="@drawable/tabs_tray_bg_repeat"
+                                android:background="@color/background_tabs_light"
                                 gecko:sidebar="true"/>
 
    <view class="org.mozilla.gecko.GeckoApp$MainLayout"
@@ -31,7 +31,7 @@
             <org.mozilla.gecko.AboutHomeContent android:id="@+id/abouthome_content"
                                                 android:layout_width="fill_parent"
                                                 android:layout_height="fill_parent"
-                                                android:background="@drawable/abouthome_bg_repeat"/>
+                                                android:background="@color/background_normal"/>
 
         </RelativeLayout>
 

mobile/android/base/resources/layout-xlarge-v11/tabs_panel.xml.in

@@ -14,7 +14,7 @@
         <view class="org.mozilla.gecko.TabsPanel$TabsPanelToolbar"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
-              android:background="@drawable/tabs_tray_dark_bg_repeat">
+              android:background="@color/background_tabs_dark">
 
             <include layout="@layout/tabs_panel_header"/>
 
@@ -67,7 +67,7 @@
         <view class="org.mozilla.gecko.TabsPanel$TabsPanelToolbar"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
-              android:background="@drawable/tabs_tray_dark_bg_repeat">
+              android:background="@color/background_tabs_dark">
 
             <include layout="@layout/tabs_panel_footer"/>
 

mobile/android/base/resources/layout/awesomebar_tabs.xml

@@ -13,7 +13,7 @@
           android:orientation="vertical"
           android:layout_width="fill_parent"
           android:layout_height="fill_parent"
-          android:background="@drawable/awesomebar_tabs_bg">
+          android:background="@drawable/address_bar_bg">
 
         <LinearLayout android:id="@+id/tab_widget_container"
                       android:layout_width="fill_parent"

mobile/android/base/resources/layout/gecko_app.xml.in

@@ -12,7 +12,7 @@
     <org.mozilla.gecko.TabsPanel android:id="@+id/tabs_panel"
                                  android:layout_width="fill_parent"
                                  android:layout_height="fill_parent"
-                                 android:background="@drawable/tabs_tray_bg_repeat"
+                                 android:background="@color/background_tabs_light"
                                  gecko:sidebar="false"/>
 
    <view class="org.mozilla.gecko.GeckoApp$MainLayout"
@@ -31,7 +31,7 @@
             <org.mozilla.gecko.AboutHomeContent android:id="@+id/abouthome_content"
                                                 android:layout_width="fill_parent"
                                                 android:layout_height="fill_parent"
-                                                android:background="@drawable/abouthome_bg_repeat"/>
+                                                android:background="@color/background_normal"/>
 
         </RelativeLayout>
 

mobile/android/base/resources/layout/setup_screen.xml

@@ -5,7 +5,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               style="@style/Screen"
-              android:background="@drawable/abouthome_bg_repeat"
+              android:background="@color/background_normal"
               android:orientation="vertical"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent" >

mobile/android/base/resources/layout/tabs_panel.xml.in

@@ -14,7 +14,7 @@
         <view class="org.mozilla.gecko.TabsPanel$TabsPanelToolbar"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
-              android:background="@drawable/tabs_tray_dark_bg_repeat">
+              android:background="@color/background_tabs_dark">
 
             <include layout="@layout/tabs_panel_header"/>
 

mobile/android/base/resources/values-v11/themes.xml

@@ -44,7 +44,7 @@
     </style>
 
     <style name="Gecko.App">
-        <item name="android:windowBackground">@drawable/abouthome_bg_repeat</item>
+        <item name="android:windowBackground">@color/background_normal</item>
         <item name="android:panelBackground">@drawable/menu_panel_bg</item>
         <item name="android:dropDownListViewStyle">@style/DropDownListView</item>
         <item name="android:listViewStyle">@style/GeckoList</item>

mobile/android/base/resources/values/colors.xml

@@ -4,6 +4,10 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources>
+  <color name="background_normal">#FFCED7DE</color>
+  <color name="background_private">#FF292C29</color>
+  <color name="background_tabs_dark">#FF363B40</color>
+  <color name="background_tabs_light">#FF43484E</color>
   <color name="autocomplete_listitem_text">#000000</color>
   <color name="splash_background">#000000</color>
   <color name="splash_msgfont">#ffffff</color>

mobile/android/base/resources/values/dimens.xml

@@ -35,7 +35,7 @@
     <dimen name="menu_popup_arrow_width">40dip</dimen>
     <dimen name="menu_popup_offset">8dp</dimen>
     <dimen name="menu_popup_width">256dp</dimen>
-    <dimen name="nav_button_border_width">1dp</dimen>
+    <dimen name="nav_button_border_width">0.75dp</dimen>
     <dimen name="prompt_service_group_padding_size">32dp</dimen>
     <dimen name="prompt_service_icon_size">72dp</dimen>
     <dimen name="prompt_service_icon_text_padding">10dp</dimen>

mobile/android/base/resources/values/themes.xml

@@ -37,7 +37,7 @@
     </style>
 
     <style name="Gecko.App">
-        <item name="android:windowBackground">@drawable/abouthome_bg_repeat</item>
+        <item name="android:windowBackground">@color/background_normal</item>
     </style>
 
     <style name="Gecko.Light.AwesomeBar"/>