Bug 840346: Flat URL bar. [r=mfinkle]
authorSriram Ramasubramanian <sriram@mozilla.com>
Wed, 13 Feb 2013 08:50:56 -0800
changeset 131635 700ef0823d91b3e8163bc7d7496cb01bc97bbd84
parent 131634 b87f9a587e86347399c90c78b9d7d05d0ef1e0f5
child 131636 eb2e980741b7b09208a0189ba454f2fb53c46444
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
bugs840346
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 840346: Flat URL bar. [r=mfinkle]
mobile/android/base/AboutHomeContent.java
mobile/android/base/AwesomeBarTabs.java
mobile/android/base/BackButton.java
mobile/android/base/BrowserToolbar.java
mobile/android/base/BrowserToolbarBackground.java
mobile/android/base/ForwardButton.java
mobile/android/base/LightweightThemeDrawable.java
mobile/android/base/Makefile.in
mobile/android/base/TabsButton.java
mobile/android/base/TabsPanel.java
mobile/android/base/resources/drawable-hdpi/address_bar_texture_port.png
mobile/android/base/resources/drawable-hdpi/address_bar_texture_port_pb.png
mobile/android/base/resources/drawable-hdpi/address_bar_url_default.9.png
mobile/android/base/resources/drawable-hdpi/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-hdpi/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture_land.png
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_texture_land_pb.png
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_default.9.png
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-land-hdpi-v14/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture_land.png
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_texture_land_pb.png
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_default.9.png
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-land-mdpi-v14/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-land-v14/address_bar_bg_normal.xml
mobile/android/base/resources/drawable-land-v14/address_bar_bg_private.xml
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture_land.png
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_texture_land_pb.png
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_default.9.png
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-land-xhdpi-v14/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_texture_tablet.png
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_texture_tablet_pb.png
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_default.9.png
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-large-hdpi-v11/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg_normal.xml
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg_private.xml
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_texture_tablet.png
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_texture_tablet_pb.png
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_default.9.png
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_texture_tablet.png
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_texture_tablet_pb.png
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_default.9.png
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-large-xhdpi-v11/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-nodpi/abouthome_bg_pb.png
mobile/android/base/resources/drawable-nodpi/tabs_tray_bg.png
mobile/android/base/resources/drawable-nodpi/tabs_tray_dark_bg.png
mobile/android/base/resources/drawable-xhdpi/address_bar_texture_port.png
mobile/android/base/resources/drawable-xhdpi/address_bar_texture_port_pb.png
mobile/android/base/resources/drawable-xhdpi/address_bar_url_default.9.png
mobile/android/base/resources/drawable-xhdpi/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable-xhdpi/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable-xhdpi/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
mobile/android/base/resources/drawable/abouthome_bg_pb_repeat.xml
mobile/android/base/resources/drawable/abouthome_bg_repeat.xml
mobile/android/base/resources/drawable/address_bar_bg.xml.in
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_nav_button.xml.in
mobile/android/base/resources/drawable/address_bar_texture_port.png
mobile/android/base/resources/drawable/address_bar_texture_port_pb.png
mobile/android/base/resources/drawable/address_bar_url_default.9.png
mobile/android/base/resources/drawable/address_bar_url_default_pb.9.png
mobile/android/base/resources/drawable/address_bar_url_pressed.9.png
mobile/android/base/resources/drawable/address_bar_url_pressed_pb.9.png
mobile/android/base/resources/drawable/awesomebar_tabs_bg.xml.in
mobile/android/base/resources/drawable/tabs_button.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/layout-xlarge-v11/gecko_app.xml.in
mobile/android/base/resources/layout-xlarge-v11/tabs_panel.xml.in
mobile/android/base/resources/layout/awesomebar_tabs.xml
mobile/android/base/resources/layout/gecko_app.xml.in
mobile/android/base/resources/layout/setup_screen.xml
mobile/android/base/resources/layout/tabs_panel.xml.in
mobile/android/base/resources/values-v11/themes.xml
mobile/android/base/resources/values/colors.xml
mobile/android/base/resources/values/dimens.xml
mobile/android/base/resources/values/themes.xml
--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -756,17 +756,17 @@ public class AboutHomeContent extends Sc
              mRemoteTabs.setTheme(isLight);
              ((GeckoImageView) findViewById(R.id.abouthome_logo)).setTheme(isLight);
              ((GeckoTextView) findViewById(R.id.top_sites_title)).setTheme(isLight);
          }
     }
 
     @Override
     public void onLightweightThemeReset() {
-        setBackgroundResource(R.drawable.abouthome_bg_repeat);
+        setBackgroundColor(getContext().getResources().getColor(R.color.background_normal));
 
         if (mAddons != null) {
             mAddons.resetTheme();
             mLastTabs.resetTheme();
             mRemoteTabs.resetTheme();
             ((GeckoImageView) findViewById(R.id.abouthome_logo)).resetTheme();
             ((GeckoTextView) findViewById(R.id.top_sites_title)).resetTheme();
         }
--- a/mobile/android/base/AwesomeBarTabs.java
+++ b/mobile/android/base/AwesomeBarTabs.java
@@ -1,16 +1,17 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
  * 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/. */
 
 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;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -357,17 +358,17 @@ public class AwesomeBarTabs extends TabH
         public void onLightweightThemeChanged() {
             LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getColorDrawable(this);
             if (drawable == null)
                 return;
 
             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(),
                                          getPaddingTop(),
                                          getPaddingRight(),
                                          getPaddingBottom()
                                        };
             setBackgroundDrawable(stateList);
@@ -376,17 +377,17 @@ public class AwesomeBarTabs extends TabH
 
         @Override
         public void onLightweightThemeReset() {
             int[] padding =  new int[] { getPaddingLeft(),
                                          getPaddingTop(),
                                          getPaddingRight(),
                                          getPaddingBottom()
                                        };
-            setBackgroundResource(R.drawable.awesomebar_tabs_bg);
+            setBackgroundResource(R.drawable.address_bar_bg);
             setPadding(padding[0], padding[1], padding[2], padding[3]);
         }
 
         @Override
         protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
             super.onLayout(changed, left, top, right, bottom);
             onLightweightThemeChanged();
         }
--- a/mobile/android/base/BackButton.java
+++ b/mobile/android/base/BackButton.java
@@ -7,16 +7,17 @@ package org.mozilla.gecko;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.LinearGradient;
 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;
 
 public class BackButton extends ShapedButton { 
     private Path mBorderPath;
     private Paint mBorderPaint;
     private Paint mBorderPrivatePaint;
@@ -49,22 +50,22 @@ public class BackButton extends ShapedBu
         mBorderPaint.setStrokeWidth(borderWidth);
         mBorderPrivatePaint.setStrokeWidth(borderWidth);
 
         mBorderPath.reset();
         mBorderPath.addCircle(width/2, height/2, (width/2) - borderWidth, Path.Direction.CW);
 
         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));
     }
 
     @Override
     public void draw(Canvas canvas) {
         mCanvasDelegate.draw(canvas, mPath, getWidth(), getHeight());
 
         // Draw the border on top.
@@ -77,17 +78,17 @@ public class BackButton extends ShapedBu
         Drawable drawable = mActivity.getLightweightTheme().getDrawable(this);
         if (drawable == null)
             return;
 
         Resources resources = getContext().getResources();
         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);
     }
 
     @Override
     public void onLightweightThemeReset() {
         setBackgroundResource(R.drawable.address_bar_nav_button);
--- a/mobile/android/base/BrowserToolbar.java
+++ b/mobile/android/base/BrowserToolbar.java
@@ -3,16 +3,17 @@
  * 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/. */
 
 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;
 import android.os.Build;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -1226,17 +1227,17 @@ public class BrowserToolbar implements V
 
         @Override
         public void onLightweightThemeChanged() {
             Drawable drawable = mActivity.getLightweightTheme().getDrawable(this);
             if (drawable == null)
                 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(),
                                          getPaddingTop(),
                                          getPaddingRight(),
                                          getPaddingBottom()
                                        };
             setBackgroundDrawable(stateList);
--- a/mobile/android/base/BrowserToolbarBackground.java
+++ b/mobile/android/base/BrowserToolbarBackground.java
@@ -4,16 +4,17 @@
 
 package org.mozilla.gecko;
 
 import android.content.Context;
 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;
 
 public class BrowserToolbarBackground extends GeckoLinearLayout
                                       implements CanvasDelegate.DrawManager,
                                                  LightweightTheme.OnChangeListener { 
     private GeckoActivity mActivity;
@@ -94,17 +95,17 @@ public class BrowserToolbarBackground ex
 
     @Override
     public void onLightweightThemeChanged() {
         Drawable drawable = mActivity.getLightweightTheme().getDrawable(this);
         if (drawable == null)
             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(),
                                      getPaddingTop(),
                                      getPaddingRight(),
                                      getPaddingBottom()
                                    };
         setBackgroundDrawable(stateList);
--- a/mobile/android/base/ForwardButton.java
+++ b/mobile/android/base/ForwardButton.java
@@ -6,16 +6,17 @@ package org.mozilla.gecko;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Canvas;
 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;
 
 public class ForwardButton extends ShapedButton { 
     private Path mBorderPath;
     private Paint mBorderPaint;
     private Paint mBorderPrivatePaint;
@@ -43,22 +44,22 @@ public class ForwardButton extends Shape
         mBorderPrivatePaint.setStrokeWidth(borderWidth);
 
         mBorderPath.reset();
         mBorderPath.moveTo(width - borderWidth, 0);
         mBorderPath.lineTo(width - borderWidth, height);
 
         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));
     }
 
     @Override
     public void draw(Canvas canvas) {
         super.draw(canvas);
 
         // Draw the border on top.
@@ -71,17 +72,17 @@ public class ForwardButton extends Shape
         Drawable drawable = mActivity.getLightweightTheme().getDrawable(this);
         if (drawable == null)
             return;
 
         Resources resources = getContext().getResources();
         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);
     }
 
     @Override
     public void onLightweightThemeReset() {
         setBackgroundResource(R.drawable.address_bar_nav_button);
--- a/mobile/android/base/LightweightThemeDrawable.java
+++ b/mobile/android/base/LightweightThemeDrawable.java
@@ -88,38 +88,18 @@ public class LightweightThemeDrawable ex
      * Creates a shader based on a texture. The texture could be a resource in 
      * drawable-nodpi/ folder. In which case, the tile modes are set to repeat.
      * The texture could be a BitmapDrawable which could specify the tile mode 
      * in each direction. In that case, the intrinsic tile mode values are used.
      *
      * @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));
     }
 
     /**
      * Creates a paint that paint a particular color.
      *
      * @param color The color to be painted.
      */
     public void setColor(int color) {
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -245,17 +245,16 @@ FENNEC_PP_XML_FILES = \
   res/color/abouthome_section_subtitle.xml \
   res/color/abouthome_section_title.xml \
   res/color/awesome_bar_title.xml \
   res/color/awesome_bar_title_hint.xml \
   res/drawable/abouthome_logo.xml \
   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 \
   res/layout/awesomebar_suggestion_row.xml \
   res/layout/browser_toolbar.xml \
   res/layout/browser_toolbar_menu.xml \
   res/layout-land-v14/browser_toolbar.xml \
   res/layout-land-v14/browser_toolbar_menu.xml \
@@ -505,19 +504,16 @@ RES_ANIM = \
   res/anim/awesomebar_hold_still.xml \
   res/anim/grow_fade_in.xml \
   res/anim/grow_fade_in_center.xml \
   res/anim/shrink_fade_out.xml \
   $(NULL)
 
 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 = \
   res/drawable/favicon.png \
   res/drawable/folder.png \
   res/drawable/abouthome_icon.png \
   res/drawable/abouthome_logo_dark.png \
   res/drawable/abouthome_logo_light.png \
@@ -564,18 +560,16 @@ RES_DRAWABLE_BASE = \
   res/drawable/spinner_focused.9.png \
   res/drawable/spinner_pressed.9.png \
   res/drawable/tab_new.png \
   res/drawable/tab_new_pb.png \
   res/drawable/tab_close.png \
   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 \
   res/drawable/address_bar_url_pressed_pb.9.png \
   res/drawable/doorhanger_arrow.png \
   res/drawable/doorhanger_bg.9.png \
   res/drawable/doorhanger_shadow_bg.9.png \
   res/drawable/doorhanger_popup_bg.9.png \
@@ -664,18 +658,16 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/spinner_focused.9.png \
   res/drawable-hdpi/spinner_pressed.9.png \
   res/drawable-hdpi/tab_new.png \
   res/drawable-hdpi/tab_new_pb.png \
   res/drawable-hdpi/tab_close.png \
   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 \
   res/drawable-hdpi/address_bar_url_pressed_pb.9.png \
   res/drawable-hdpi/doorhanger_arrow.png \
   res/drawable-hdpi/doorhanger_bg.9.png \
   res/drawable-hdpi/doorhanger_shadow_bg.9.png \
   res/drawable-hdpi/doorhanger_popup_bg.9.png \
@@ -719,18 +711,16 @@ RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/abouthome_promo_box_bg.9.png \
   res/drawable-xhdpi/abouthome_promo_box_pressed_bg.9.png \
   res/drawable-xhdpi/abouthome_promo_logo_apps.png \
   res/drawable-xhdpi/abouthome_promo_logo_sync.png \
   res/drawable-xhdpi/abouthome_thumbnail.png \
   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 \
   res/drawable-xhdpi/address_bar_url_pressed_pb.9.png \
   res/drawable-xhdpi/alert_addon.png \
   res/drawable-xhdpi/alert_app.png \
   res/drawable-xhdpi/alert_download.png \
   res/drawable-xhdpi/appwidget_bg.9.png \
@@ -870,94 +860,51 @@ RES_DRAWABLE_XHDPI_V11 = \
   res/drawable-xhdpi-v11/ic_menu_save_as_pdf.png \
   res/drawable-xhdpi-v11/ic_menu_settings.png \
   res/drawable-xhdpi-v11/ic_menu_share.png \
   res/drawable-xhdpi-v11/ic_menu_tools.png \
   res/drawable-xhdpi-v11/ic_menu_quit.png \
   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 \
   res/drawable-large-mdpi-v11/remote_tabs_on.png \
   res/drawable-large-mdpi-v11/tabs_carat.png \
   $(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 \
   res/drawable-large-hdpi-v11/remote_tabs_on.png \
   res/drawable-large-hdpi-v11/tabs_carat.png \
   $(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 \
   res/drawable-large-xhdpi-v11/remote_tabs_off.png \
   res/drawable-large-xhdpi-v11/tabs_carat.png \
   $(NULL)
 
 RES_DRAWABLE_XLARGE_MDPI_V11 = \
@@ -1017,22 +964,18 @@ JAVA_CLASSPATH = $(ANDROID_SDK)/android.
 ifdef MOZ_CRASHREPORTER
 FENNEC_PP_JAVA_FILES += CrashReporter.java
 MOZ_ANDROID_DRAWABLES += mobile/android/base/resources/drawable/crash_reporter.png
 RES_LAYOUT += res/layout/crash_reporter.xml
 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           \
   mobile/android/base/resources/drawable/awesomebar_tab_selected.xml            \
   mobile/android/base/resources/drawable/awesomebar_tab_unselected.xml          \
   mobile/android/base/resources/drawable/desktop_notification.png               \
   mobile/android/base/resources/drawable/highlight.xml                          \
   mobile/android/base/resources/drawable/handle_end_level.xml                   \
@@ -1059,28 +1002,26 @@ MOZ_ANDROID_DRAWABLES += \
   mobile/android/base/resources/drawable/spinner.xml                            \
   mobile/android/base/resources/drawable/suggestion_selector.xml                \
   mobile/android/base/resources/drawable/tab_new_level.xml                      \
   mobile/android/base/resources/drawable/tab_row.xml                            \
   mobile/android/base/resources/drawable/tab_thumbnail.xml                      \
   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                 \
   $(NULL)
 
 MOZ_BRANDING_DRAWABLE_MDPI = $(shell if test -e $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn; then cat $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/android-resources.mn | tr '\n' ' ';  fi)
 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                    \
   res/layout-land-v14           \
   res/layout-large-v11          \
   res/layout-xlarge-v11         \
   res/layout-xlarge-land-v11    \
   res/values                    \
--- a/mobile/android/base/TabsButton.java
+++ b/mobile/android/base/TabsButton.java
@@ -155,33 +155,33 @@ public class TabsButton extends ShapedBu
         // Additionally draw a black curve for cropped button's default level.
         if (mCropped && background.getLevel() != 2)
             canvas.drawPath(mBackgroundPath, mPaint);
     }
 
     // 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;
 
         lightWeight1.setAlpha(34, 34);
         lightWeight2.setAlpha(34, 34);
 
         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();
         levelList.addLevel(0, 1, stateList1);
 
         // If there is a side bar, the expanded state will have a filled button.
         if (mSideBar)
             levelList.addLevel(2, 2, stateList2);
--- a/mobile/android/base/TabsPanel.java
+++ b/mobile/android/base/TabsPanel.java
@@ -200,27 +200,27 @@ public class TabsPanel extends LinearLay
     @Override
     public void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mActivity.getLightweightTheme().removeListener(this);
     }
     
     @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;
 
         drawable.setAlpha(34, 0);
         setBackgroundDrawable(drawable);
     }
 
     @Override
     public void onLightweightThemeReset() {
-        setBackgroundResource(R.drawable.tabs_tray_bg_repeat);
+        setBackgroundColor(getContext().getResources().getColor(R.color.background_tabs_light));
     }
 
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         super.onLayout(changed, left, top, right, bottom);
         onLightweightThemeChanged();
     }
 
@@ -268,27 +268,27 @@ public class TabsPanel extends LinearLay
         @Override
         public void onDetachedFromWindow() {
             super.onDetachedFromWindow();
             mActivity.getLightweightTheme().removeListener(this);
         }
     
         @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;
 
             drawable.setAlpha(34, 34);
             setBackgroundDrawable(drawable);
         }
 
         @Override
         public void onLightweightThemeReset() {
-            setBackgroundResource(R.drawable.tabs_tray_dark_bg_repeat);
+            setBackgroundColor(getContext().getResources().getColor(R.color.background_tabs_dark));
         }
 
         @Override
         protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
             super.onLayout(changed, left, top, right, bottom);
             onLightweightThemeChanged();
         }
     }
deleted file mode 100644
index 603379b42fc7e956460ffab8230a11c880d9685d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f37cf0a9365b47b9335750427a5e2a92263607b3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index 19974a096aa6fe1cd3a1e7fada9e1f37c792343c..3ddbdb1262a0dd5ca92cab0ab1f78b2c81ff7dc5
GIT binary patch
literal 591
zc$@)G0<iswP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp0006ONkl<Zc-rmT
z+fKqj5C&kL1P>47t%sK&#tV5N<w`-NNCWjoV>Cu3c)*aDn4oB)F@^$dx81HY7>wEi
z3JUBxn+!LU@PF(sZPIBZGT0D9DjEZgt*u;iUCYIjT24=D`3jT`C5Bq*yqVIBQZkdz
zVwTNKed<?WfLh%)cD>?dS=>E5idwxPY=;TvdPA+I<%s8(S}Ox)$?oiN%!V2J!fm8?
zW&l>ZsZ@o-+@XVd6=uS0kkL$P#{7?Puq0ypM+J_*+PJ~OX7=!;=%=*YVuwG$&m)z|
z&lb+F{BfMMZiSgKdsiT?=Y!*-DHH5tVfHV3@-r}F?5@bLEW0gN*prD+;F@Mkz^3K0
z;@X7<v;=@Kd&{!zyH5YEXbAw%F3MTiaqU7&00<}0TUCH)2>{^=#a0Cf7AF84#pTyu
z6<R(5TQ92M+C@MD5|DrdBp?9^NI(J-kbndvAOQ(TKmrnwfCN++82K+iTOnZB%@<dh
z+h=GA0L^+sR|N=`kQ<=)Ps_^O00m0`cv>n=!kb(HAV*7R8;QeMLjEQMmgv|gb6u@Q
z;UH6DpoxaAtz6BfGY1Fy65@Q!-m_P&bxveFCfR=UU6(I?s~PY8yl8tf@WGl4%hK_@
zg}!=5Ez62B<|W2-HaTX)j01Q6T9$~y5{Nslr@O9)S3GP4Aco)lmVw7@+n%Oo^D%f_
d;LjgFcm?!OWBpAIX<GmQ002ovPDHLkV1l~S2Co1B
index 54147451cf1afeda92290ffca5f940b3c6f58d25..e01180c43bfec602dc627659c7300bdbb2349b00
GIT binary patch
literal 524
zc%17D@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<5jnFkbd_aSW-r_4amT-XQ}4wuIw~
z-H$B<#XY7of4ucnXvHh%odKssAE?+mSTgPj2vMKQ84$=bWhv_$za^DSQ~r0qWjQH)
zjL&+NvZ!pk9BcBP!#3;B+x%lQZClkBqr4*g#D&$H4a&Y+8=Q-`c~{R87<069&7_df
zpj3B#oAnbi=Q3`tsB=!<_VVcc*B_!8q}`M(IWuM-%9&8e68XOD$j5E+Ex$q*Z+(5j
ztZ75b8UF0Nrei1WvLuGgv(DLRV4U`!GvdHiiJNV+#na-WCf{$I^ZUG+&uQPwqC9s?
z4{%3pxfOQjP_O&qqbx=LQmpghG7K9MMZU){E;`C^h`Hnemw+ytfY^&0q6!iBco%5z
zSYNt>VGW0e1C!8%1{M_sMovuT7OoTjxC`D06kL7gZCAiPWBn~V@89oo<}ZE5wqnAi
znYuY!W?1hjtl^Z;VsDVr)xPbKGOctidsAZW{2qZt9wBMD$^vQbhmVEnO<cD9!_!Mn
z37t2$zX)BuJnQzRuN=&a<hJJ=n{8`0CF>x6yP1!-#Dw2_t=w8O#5PNxx9nSXEN8~Y
z2ixK=vaC2|ZFKh6=6ajS!VPL)cP^K-Dx4P|y!@x+9=#9G*UQ&1wb~2!mwkU~0E}e@
MPgg&ebxsLQ0GWc|SpWb4
index 1bf82c73bcbfb7a0ebe1365a97bac4b945ef6484..06990ec2a9117c032c2ff1b4832eed7e39519edf
GIT binary patch
literal 937
zc%17D@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<5jnFc)~bIEGZ*dOQ1MP;j6?+i%Z+
zn^tdl-ygX4kkO<;LSU+eNS}pJN>Tn)XPuZ+OxNrfGeo6z#apI^Eqg66>CWx4<HbR|
zyenJ|=WboSZ;4iI@#p%|yh*F(@Hu3+=02+5y3J?ug+_kG-pd;rj5j!iaO4;>ZuB{`
zTjzIO{|yrx<yS1ndNxe#HG1chC$(#_q=tLRrWwKyL}Y%4?hG+uRc!Q4<5%7{-<c;&
z;I(K@btv<ZKSj#UUz8eOZ}N3?naRHWhrpc=Cs<@U)fAOB99-;o<Z8IY?nOQqCpX_X
z<2lpv_qL`Q+sloPpFKBo9^vnnxczH~i{$PlDH|Tz?u;{-)3E#^i|h%Td;Ue<62BMq
z%(?npt^LiiCJVOeL+k=VCyspDbmv*o*PS;TW2Y$0<TvN9n&*&xbmr`zCtW$+Bxmp+
zU+L-cK5mxqlQU=kJXyr@TJnV8iG&Hp>L+H_)|FjsN)Aw*aC7SWonfo@wb|KkT*mr7
z_;BLZCCwr^cdoo+tXeaz<Oe(J`=G;#VF4Bz2VcoL^k1FC7xlr+R3?qJwOMSBD{p(G
z<HH3k*WDOx!@R9B4$i((Fhf*?&uc>w^Mz!fL1KISAWB%*2SQC*9}ZQk4ORQ$G{=JD
zS)S~=6*HyyHa8t|<c?d^c6iN#f`F#^`b;24Txb$s@z6k9LuO0DEQk`$Iw`g<5xOrI
zu$~Wwn)^ToYRWXIDSR*+KS@H|T`&P6^S9*xb?#|w3!D_1O=r*6x3gbp9^a*TVrtM8
zl|_s8zBNAg=JV$6xPzBBI4A^HC+9OyG5-B$=|5jHhwi@yJ_^D;w{IVMcE-+rx5mLk
z3~zMjHBE3>_U+m^0j6|tJebKUFHE~8FVQ1+;8)h4;~o~u>7q?Hb)Tnv(tM%u#nC}Q
zI7KMpyza4Rz00k3`swNIx$ZkZ)fQ~Iz%AJ5lexrr+H~!7t$sPD`IC){zsa9lWqPlF
z?*t{Mk10IIgd%Ef+Y=l2Ila0X8?i3y@m5Rb^ocj`H1YhsVh|U+iG5e6QKO;yiSGwK
z%AW0c=I`Kc$a&LgQkb!)dbhY@`r{s5|9_u6KY4mQ_dmpR_j!j_WA3tB6>r~5UOFoG
n;*WifT=RbJKOgtY*D$YT+q{Umz~Bim3o>}R`njxgN@xNAJtC)T
index f7bd034b21476b157644b81fc55831810244bdc0..8751318da3b8bdf439e736e42445a897941d1713
GIT binary patch
literal 1024
zc%17D@N?(olHy`uVBq!ia0vp^79h;Q1|(OsS<5jnFdz4HaSW-r_4fAZ>=1U5;~!Tp
z^nE6HmW5O5&<_p631WdqezZ&ya?#w_)^SWhF{##s!!c&Ye#i1hUKv}vrJ^#_XRh#F
zwQcLIv@0rF`^xfW?LTnSrSQ||IWKLC9;DP9^?T3AzVGCtHtYTVYAO?|)rDr>WmbLl
zH#w|-<6jToFALs>@w=_4U!lpRs#m_7onL+5F@yY_#T?%Ec;6_T3p%gSvc@L=ac_R>
z;`djsePph%DQxf)dslR2oq6@sZwt$7<Uffld4Fruk3IWjSN=R5Fmr{Qt4`ddNyXV0
zHYB7b9-f&S`6BnqmmhU9b-H(cgx|2-CVp9D$C-2P8Bte)iY}~v<ZHj>e)F3rXZO^$
z-T(Az>T9Q0&*YwH6fBS4{9{R(?~8(<$A{EvZd-BPJbn9SfJnt+>HGKJEYn|7ms1^J
z;TTaUbuv2D{Hncj!6M=Ayb?wK#%!;xEpp!<9iO`GRG!&}qYUfc9}DEVV;;RJuRth&
z+TR?*13Bt#ngwUQx9?{Dly>vH826h4Dy-|)?YbvB!TfaHHi-u>_<RB%{OjLeyjgdm
zhts!Uf1VHT%N#znP2S?j%q{;fi&<s8L+*wH`Y#<OL@zLsc(66h;S<*tHs(FQSQRQ+
zvzi(I?UbCbhiU6UCi9Dp3fmo04Gw7QHarns!OQl;-59Kdwa$&b=?>G>gADceIXvPT
zZzVMBU&{_M*WkeEY{rw?0n$1Jrm`GG+#x`7w{U@tW6)p60<rpOiNXop07;$?*Zsk2
zc?y;YLTr?N0d-V?Ez}|(m_?C15R1fvz-|$XaEHpAzs@u%e1TcS112khCt@pjp2dHE
zp2YxhgWWQXf~kh>;_*qIC+bec)kv;71`I5-cke$*LITrANO`7K!|e$l${DAapZ<67
z36Hpg@#g{)<LUbvtm0n27czsWD-jh-7djFAAneGWJ1qx*aVCAk=y9$}bK#fZ2Y$!i
zCr9f1**@`u+dZw_Hv_)d&0MGv)Eo#*2FDjiS{<Af@VL*_U9q~-TDpsgdwr6KEVJm0
zWe4W2st`FPAAYZ7(IdSS_55dV_4iJF&ALfuFSER&zoS*yyra7^th188b{t>j#rNp>
zljqNP_qgUSUUvDZMbMMJCmx1Ru6=2*@KJp7l;g(Fu<t#5t`np*oa=Y>)EQ5`c=Ax_
zyzL*4Mc)5;TK#7w->*yZ2`zU1%bq{bY!&*x<-?u-c`trzHZ6UhZ^nP{HtWC7+vRQ8
YHy57QGAr$y1<ctDp00i_>zopr0Qe)|c>n+a
deleted file mode 100644
index 99c283437c171fbb0963d664e2894609038f9aa7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 73f430f9be57ba3c5deb2a716eb9b095904ea62a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4e6fec0c34fe63648efb6d852550650c1c8e895f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2c6f141cda5b402257312cb505614534aed5b0ec..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3713f1b9270eac384c57e0a14fb73936b7ed94db..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 075d31fb68577e9b6d7e385141a93f8f2f07dd47..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 047e784a0a072894bdce7d6936adf3dbf4c7835c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4736d9dfa805d2b41a240eb77d567715208f7c80..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d894baf5f76851a16749b751fb8587ebc9ccaf04..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6ca8fafc24376148e8b354c4f8d2365a489c7716..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index afd8b9332b7bfed9c2a7465d9501591c117694e8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3bd1bc57c67768e939a14b904d9f06275d8345a3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/base/resources/drawable-land-v14/address_bar_bg_normal.xml
+++ /dev/null
@@ -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"/>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable-land-v14/address_bar_bg_private.xml
+++ /dev/null
@@ -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"/>
deleted file mode 100644
index 305d7445198d988278b9aedb1afb613c5a5cee43..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3d53913381a7d23d35c685de61eb2074f7817e0b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d8f0d6d28bea7b87d729a27f1381ab142c248b4f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a60f71535715824cbf553c5c4400d5bb5072f14a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 58bdd0f562e8835570c09658397d7384e996e2ba..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ebf75e2833cbe068485bf28f285498a00672f46a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f5834f35838cfc8a38be1676ca2ee46ac51f07aa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9d6d1de43ed91d00e399ff25d0c64b2a4de42894..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0922b48efb23c9725c49fbe69da4d5dd30d6b756..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3d5d8422bc777139df5a1694ba4eb685a06a6827..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c1b734a25c28d265de408e5f336f7d0b25f81b3c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5bdd1816a654ade6b87427eb4fd38430012693ec..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg_normal.xml
+++ /dev/null
@@ -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"/>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable-large-mdpi-v11/address_bar_bg_private.xml
+++ /dev/null
@@ -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"/>
deleted file mode 100644
index fba50bf10a682351269b8268288562e282e17a49..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6a8ebdb9f9eef89b3fa497d4acf6c101d4c058fe..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0b077bd4b712bdea9b9a7dd48fd0c0a8885d6782..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e8c57b10bd68b02f6bcfcbc941661c617cf45184..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index be521861225b9365a0bfee7b446d7b62b8b0a32f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 618afff37c371f2ddcac0de38eae1424c05118b1..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 52ac1b2ff9497f811c45f483acc4d66d13c3584e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 61ee24ce54d38f54b92bd6af70862244385dfd89..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 763f15206d754f197403f8f54a722967da74f9ab..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7868e8c504ef4d79f7410ae14609f8b71399db93..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 04dbda21bf5410945bf127e6c5e4c94998aa96da..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index eed177a034416f27c175c1a31de2ac44e7894629..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 090e4deb6c8bf01ef94475a360a7c123644c2265..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 522863b2321efdccb12d3cec4612499962769c02..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5fbcdbeb77d34b970d13016cdbda4789378f2238..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5132c081397dfe9d963d6768da41d83e9e179bee..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f6fe299bc4f0e3ec4499864468041a777debab3e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index b45e4a898dffa6f5e9f79a5d40302ed8ef0880bd..5cac1a430a35dc24758de38d4581d48ae64c27bd
GIT binary patch
literal 799
zc%17D@N?(olHy`uVBq!ia0vp^ULefD1|(%J94cgBV0z~1;uunK>+PNMezzS2*b4d@
z9%ypuA2@x%J?j^XuEJNjl`UJmyj+CjZz&b8$f(j>^~?XQs!D@aqEPkQjG6rw3K`cd
z1XLdX4Vxu=V&2b<yX91>)6<q&mmF(qR`y@~!h$>c>aSO6OaCnjxmoBv_1D4{{e{M2
z{|vUvitkiPfAa5v!_(Y!&%7Oa=HHDvCYjk>X^2|J_vKV!n)&Ll=|z(n%&UWoxBPzD
z{qNuFemfhhi_6n(-?DqHHaHccp#G#yW}<eH+dD&vEX@VmRw_(g)vI1~ur_ATvzjaR
zb^ou{+E;62GVff>c15W9?fvSqy>+)ECUS4xe$Vvl^?Z9{%j|c?w*!Q;oO@S%own`x
z9{H(Sy?jsl{r){=dy%$a+ru|mB|>S}Dpn*FmitYyH@~-AJlkfy$6|-x6`^K7#j^Z)
zTYdRX#jT%Ty(DnKwTk;%OPUTni@le(%0_?tlGKh{$8`?=Uw9!oVe)3)Opz6_X;<Bp
zLU#U1-1zKGRb|z#yH7JYm?I<>UU;<l_y*BT5rc--O1G=Cvio<=oRb#J#jQML%a3($
zJr*~#3VJPzneH+D^!n_UN%eBfO1#Ws<_q<<=42UMHd)}NG5dB?VQ!OPm&5hufEFc@
zg&eLLPJ&%nm~7ajr2cPO{bz#y?l{*8EJv>|Uw`P&uMz=`eG}x_b$SAp|NSR5@ln6*
z(L)?p?d;-IFBv2xwpdxb&^x7H+0u0`Vd9U(#a)YdUoSlJ;F`We?fv*k@nK@lnuZa6
zUq6-#w6SK-FH8Jk^ELcc)N4yozNl}Gyiq~F|G2Qb{MdI)=uHI6RmZc!^OqEE+^D@(
zNjxLE;fmYZa;u^zzs{WcY$UTqDD6@U`}Is)>HH6sRZ?14T5c_?>zi^y-@AWfU)vi&
z=C2pj7fxfhpXu|Di`!AecB=HgDbnwc&aM+npWRh_+j-py$(^4+*!I2Q&yAEgZmIlW
W(z0F0Cb0t(K7*&LpUXO@geCyn0B->R
index 415be26c494ddb3835e018f94597325f07e58948..f806f6fe1cbf29f2423d56650923879742e6933b
GIT binary patch
literal 701
zc%17D@N?(olHy`uVBq!ia0vp^ULefD1|(%J94cgBU~2JnaSW-r_4bZq&>;g6wg(ed
zT`<cG&$+Wo{DV=2%2yUGIgjuYx&qr?c$k0OE5$gK<<ym#m;TJGwD!3FTa7bOZKc3h
zv&$PCoU<c?om`j|pU!>Z;=f2aUeiv)=kTM)+UBPw7C)VH`p*CTb1yTufB8_!99Y&{
z8OeP86aQNGx$&2s#r|yQ>p64rW9Q3nNy6$YJ*SwhJSQbNNBa4Roki#7>}HJ)@HJ1(
zHQj3bs^rMr(=S%kB-~1vvDR^CF>g#atMpaFU3x1QbCy?JdMm5fr@TY0+f+0AYksxO
z>p*wENISpK*Aw<NXK!Ad{Yo;@Z^ev#KMu*NwA-B3T9Yi69dm7;v50QbLWREve?>hg
zZ+diecgE+E&%Vy<Y7dK;%yzrHp_jXSDQn!R<GBH|+V0zgEP0>6yzPU7Yje?j5epIN
z8~d$iFI>_icd0?F;Qq2Hx^n`y9IfY)JINMpu`uJr*@i81>WtMz{#M2?oXitF@yPs2
zkoLh}Uy_+$wJ=>c&mgjZfmOqSkt?8q2@8`EtJGHhDG|+w60e8q)C5@A?d_V$&&B>J
z{Gr{1`5J#27Cil!`CYW%B8*w#CiBmfhkM)H<hlMyMXlPjUHAHhin*uc4Htb{D=zIi
zE%o`Ahe`=6nt1fecGdVUGH2{xcH8Uv&)~JkA1c1wXkqKCwO8Sg-@#0WfZ%nN^UX6m
zRL<+KZ1!aE5MEb$KfG^E?;10IXWMT*OJ1#a-NaopyN;K8-O6*<mDcvJ<6in%G5-YL
zkMOs1zk5n=WB9tgZvXlzr`Aom_WjF;^xZGS&&rsl=AECT{rt?%$7icE&gQFaDA?xD
Y_a{+FbXIRRFj+Eqy85}Sb4q9e0O-Lwj{pDw
index 453e75a940cf3d38b542990a0a526c0c6100c593..81b00f0448e72e9704107f85b303a934f40441f9
GIT binary patch
literal 1212
zc%17D@N?(olHy`uVBq!ia0vp^ULefD1|(%J94cgBU}^SraSW-r^>&VLzI3TT`|}%%
zz6DQ+<K&fBlex{EE94Zf@$|24<|BrMo{o!pwfRDx9$<IiQrCM>)W~5W&be|)-xTrv
zs%3L!>yjU4*nG6$<U4Wiqlf*;OXuF5`<zk!^zgswFDkmLb(*C@W_8&w53cEU`)T}(
z>7-)+MA?>V9qa#Rre&YeGEV;X-}!=o{v{#52&WzX!C3|kPk*r1da4(Eh@7+J*72sC
z7FFe(<I0&6=lSJbJbzNDP>Xrny7hW@t}9#I$hs|DQ#<YFa?NM^i_Sa^efG=jd(256
zquFOVB2&}cZ>-uN_hI|-dbx)TKWo|d{^$ApKJwk|LvK$0eOR{XlkB=R-xgKO^Hbyg
z!hJ|L((ZWX$|t)&@9EEP3~Tv&VNsd5#^(15_v0UJnQ9Q}muNp_#j(S`)vgNMJN>EB
zFPk%(Tl+>~D6gyrm)rERjfdmj@fP3mmWZB_AGB?;#<>eG@A|K7DKI{{-g~9^)IZZw
z&+70UY1Ll!kF)pPxy2i2R;OEfajs4i7hk7ga_8dNlg%#;7PV}Bs?^B+ziZZV8J{BK
zlZ#_y0u!#jd9>*A+U?6`@7yHjHf6)MjwbH-E5}1zcSx>#e?*Wq?5v*NniaOuU;8gC
z5L&CVU;7oO*((?A)9<@yIX8P*1h(B5pXvx@n0B*GEm*{}Uwc(suhqp<pMEb&18VY{
z^6<OsT?dF7(a^bS*E++d)hn#Z4h+r+;8Z{L;rAjt7pUyk&x{-Wwru*t92nbOCC{t%
z&_%K?{K~iLBM{^6xk7FF$|n_asMF}rx)oed*HlSERL5V5hM9T~W@>0%bA)<SBv9@(
zM2_F3RD0DIDX>-hR)k-KIx^NBtO4k@=)j}l9i@w=J_QQGy!q7#W+xNW&Rty)|LVWu
zf=KOKaT;R5ZvEYPvCFg$o&7M`L4S8s=;m%<psGeW@0htn<oVakL|~vF68|dnR3LBJ
zKleG}pISjG!b1`#y?gO&?o$hIn-;LZm1o^1yDUBL_!tVOUkoVBYcbuuqri1-?DESQ
zS}$c+*{1~Sul)7+ZkXrf5HWFCakE1yVh_{0j9<pzh?rA5&2+PcMFH!JYZkn@egV7>
z)3oB3makm1Au}xTxbdqq3&rBs_XnpjTfYq1=Xw88cH*WvuZ2y@UxdD@k6Sod`tg>g
z4Strc;nOxm*d^9|VX`e<!tZiIw?p>xw}jT0i8c@3e|z67y_wrt+Osmz?$dM=DgJMq
zQU@8s%#Rf)Og_{rc<*0X*K7XbIU;h8<)hcK|98D6wfSU^QFh`p%e>=CJ%@g+x3j!d
zl-m2yET_DwBxUL0sU=&gD*F7^#2;a<>&em-3K3RIwEp(qBR6(|v9x$5r@Dsno#iVX
zg2E#Heb%4+^!Q5=zaM{ovF_q6<o{sZf2As*>&%pVaITzL`{CnW$FB$3g_@79-Ot$Z
Xo;TsAn%x{=sl?#v>gTe~DWM4f@LWaS
index 159624e7d9b5c90a18bee73f3372b79445e3e25b..57741af3ea65a775b0140792b01238d002f3468a
GIT binary patch
literal 1308
zc%17D@N?(olHy`uVBq!ia0vp^ULefD1|(%J94cgBV0rB6;uunK>+PJ=`5~nu$JLYG
z?pgaZH6ZZPH3`PWR}*@qxZRYGEI4+pi9aJiLpD5ir|3-!J(C2V7Bj<xM>3K#mM{Gw
zCg0(@%s99AKl7Aa#S*jl^DB$bo?N)xXRFHP>Z-~9yDTryJFmX|t<JM@<%z9(15$Nj
zy~Ag$+i&F2mwLgk#-~R>yhEF1Rgd=5yKbj;Z~Of2y6uGww%((9Uj%|##5DI*^Y7NF
zSP(4RA!hY4uh4!OXA4W&$xXMLTu!}rcHSuL%A~mT$Nu+vT~}gmw0~wXnZLa+@&7XB
zih^A3Ygg7gTWyuOSg~l;gSi#v_a>G<ots{q=w7z>*loGT?=Qa2(0OxIh0!zq_WX?7
zGgj`>n0jdU_pN>o)f=^~&ud?qnRnzxYjUgk3uz9%yq_f(*)GZ4DdM@+FOmMe%Q^6-
z4&%w_{#ub)9*l36*xuZ`DB$Pa42iqVLX8dOX7b#zOBl)~uQPrZ{+}yOcGZU2_mWF4
zaG$FA_{SwfnRUbBl5^z?%FhKX|E}O#enq6QVcXaIHoK75zj&4yn?DdsTX8Wq<NW(Y
z2aV?E%5&EOjhg!I&LN(u^}O!q_j0kkseO=ZzVJrqu3~QED?7stoD>%P+$IJWk+&|K
z=y2fGuB~}a8&{V+7b{yKJ3~!ig4ea(oJZGPnj8Hh;QuwN-$Du>g)|+0-(DD%>F_{r
z$|rN@-aQ;1ds;93D_bF+0TufDPe$RRm={phw#y9%Vl|%Tw^@DGfeBrN3jKO3>F`K*
z$~SZ8xph(#D!7;aeH-8pm;CApmfY@~yNt1McfhIpJYP=>Hynx9cng&LSqPQ1^<ri!
zUpQsI<g4ZG44vBpZr$hmYQW2Jr#0wb+KS-W5FwtgkDVbp+q2+?9sUay+SSj-^3F-K
z-uTLQX_)%Edts98Fv;!Z%tHAKx9pc))d>?a=Y_eaN*3z5cS~UAUzLR!F&C!(q$x~j
zDop4@79<Gl-&pP8x_nqWbA^xAyBCMoJ<+<mvsLod5v~}UjWQe&Ge3O(m<f(ezR-R_
zCPwMWb#@cZgJNaI!nVAF7Z+M7Ja{@~zOvjKkUrU0X<LLjEarSG&Ug{9i{s@v-7^6@
zMLl?z8MrDWL@NpZ@`x6Wop7$%Gv<+4v0RRf&w}Y}f*%r%{;*5)s~=aKyYrx_f5Wp&
z8D~@jlmsr!<#-<$2~3o4?54N{ySA?{Hca94uu6VtU31p&*5r!ykAh#-3LbgE`go_t
z-hd0T+~?;W)w|U{w_T~@{A)(Rol(C;*BpJ~psQdhGWWo>i0hC39`@b6x%pdCc-g$~
zlTFg@>0Mb+xq$6Cd)}h_Wj_{d>zI3y`G!FD!BszEJ&wFyrN{OD$nKAQdtU$E%6jJ6
zp}sf2=F3?sy<hX#RO0=5#zP#t&lakmeg8|PDdT_d2_aP`#m3l8Z?-)+Kk=7Q)3V2>
zFI?WwGo3>xNKbh0o1(k(ecb+wP8P{=|IcgTWdB8{cCLySun4(yChz~7ik9+ccc;tk
j+g=j-pSAr=)n8t(#wVFAHV-xfOFafpS3j3^P6<r_q7;Li
--- a/mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
+++ b/mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml
@@ -7,28 +7,28 @@
 
     <item android:maxLevel="1">
 
         <selector>
 
             <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>
 
     </item>
 
     <item android:maxLevel="2">
 
         <selector>
 
             <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>
 
     </item>
 
 </level-list>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/abouthome_bg_pb_repeat.xml
+++ /dev/null
@@ -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"/>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/abouthome_bg_repeat.xml
+++ /dev/null
@@ -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"/>
--- a/mobile/android/base/resources/drawable/address_bar_bg.xml.in
+++ b/mobile/android/base/resources/drawable/address_bar_bg.xml.in
@@ -3,14 +3,14 @@
 <!-- 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/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>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/address_bar_bg_normal.xml
+++ /dev/null
@@ -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"/>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/address_bar_bg_private.xml
+++ /dev/null
@@ -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"/>
--- a/mobile/android/base/resources/drawable/address_bar_nav_button.xml.in
+++ b/mobile/android/base/resources/drawable/address_bar_nav_button.xml.in
@@ -6,14 +6,14 @@
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
 
     <!-- pressed state -->
     <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>
deleted file mode 100644
index f01c0ebcdb4f18249f0cb935501378dc6b4c11ce..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 15bbd27f7a4105f3a0c592b00dc5db81a4bcc260..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
index 9f84ce94ffd45c0adc0b84e3624064d766b2467c..bb7b953fbc0083b654bbae41f383859fa3f400cc
GIT binary patch
literal 426
zc$@*M0agBqP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0004TNkl<Zc-rmQ
zZ%e{J90zb84SXx<YfT?a@HOm#tza$KAMi=_0-Pp}GNmZQ$_(7yZk)fLH89WBpyi3&
z!Ph5_-}i&3!(FMAfANBHpvydWk6M;@Y+7FL#Bw7DFDN*xyP6Fhxj}|uXr|@rPWvk9
zheQ7I_Rb?hIgME%!C5#HXJbdpa+`*6S^gbm`_AC@o)a1uhRF(cgm)u;YWp5`Z+xHE
zw$Jt(4^NYS2W{r@dBUMv-wHds@GJ01v0bCmU^f~BnA5(l?PB|W+Ez3Ou>N4!lZ8ry
z1_1`Y6e1gjhIQELrN~>tUv4D=Og1Wwf+?7SDVTyOn1U&og6$8i^aUe(0GkUi_**Oe
zVPvr&9RW6-&1<q@)7M#DfOW%B72aeLVGIphj|d{l8q%JSpgZ&IA_xKvE^;KmJnYVd
zed4%A8Pnn7WCx%Gx|-whxSac(j1W?xaa@PozyMkx=7Yvb2WLY^^&n0;xukqsOA*Iv
U9Wuf>9RL6T07*qoM6N<$f*V!6zW@LL
index 5a90dedbeb2e7e1d6c871199b6151227ed69e329..7ca14930cfb4f40134500cbbe10641bc0e4f7c0f
GIT binary patch
literal 356
zc$@)b0h|7bP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0003iNkl<Zc-rmQ
zU5dgm6b0ZkmX2+H7Bae4^+93wBC`w8*@r$jLrXljSW((ih0r_5y>NVy<a|^G6Q!P?
z5Gn6FpGxb6O7sCaBOy{~uYJ8Yb-XYc7OnLpt+Htza$|#WK5A%B+M7Di^@YxS7?mVj
zS`-`8mk)HI^SkbT{661})|+WzMng5BPWqJkU^6_aa%@x+>Lx=ArqguEg=#{E77XG8
zH;fD|7=9_g+%PiS!|E4qR1<*-Oke^Nn7{-kFo6kd5T>p$_P^GJ^T#e2`(dQ8Zr61f
zS^k5=$f|vO%j_I)mW;5H44qd5h4&k_j}hJdcNchY#{2E~FgI|ia>YTv#)4`DRArre
z>Kf`c*4mk|euc$9$X`Uv3E9!!=$OC76=z_|!(0Gcy+>|s&Q(1C0000<MNUMnLSTaG
C@tlSL
index 83f3ae8799aedff539cbf97233e16186c1db800e..f66aabb6341607866e00db9d3dcd6e87e037c19a
GIT binary patch
literal 648
zc%17D@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFfz^z~t}g;uunK>+X!Ze!_twt=~mE
z`JFsku74E$v3jMM6i=Im0M8NmC@;?)SGgZsE7&y@E%Z#@E845bc>7Y*mWs4#+2+Lp
zcU21v=T6=*>1y1YZ#D6^E~h=~h_UrpdEG?gwC|eJTG7eYIzg+}ecid;Ofp=2*7Sud
zbf#9sDv2@YiG-#IuP%BVv~q_|v`$s6Ip3ST>~}bWy4M{wEq!b37rAZf-}`m{W@q@C
zJu=<*;i<uf|ANft9YsH`7Sx#h#w*^iZqDLBPZ{r({wH+)FicsQQ)-YD7}%xrX#3+6
zR;NO?Sw(CV4@&;|xBf(o&&*R{?8?vPc~5`(>`jWk+p<kpAMS~Gf6(@E1Fz_L^Q8Ur
zxwb5P^fN4{wRvho66gJnxq93n0k<{3T^0aUY)|r*(P0(w{^7P}v&MzCuIJGkS^316
zx>ReF%RWUcfS4i22{EIuc_-KmS$mNT=cAw3-q2y+%y?92pP+S>0z|JQUm95NwSD>^
z0qKp`Y#Yr&Z0>i7T4=BUZFzR-*N1f_k#Q2K^_jBeQ2}PRw<VP?Id<r6TD|e3vhoEv
z+iv-<xpC(6{qMftw&$M;`IZ>x<+f(t^o`GQ3w7>%f0I`+b*WG4YUlgPOnm0EEb|Wi
zOx&0F!JXxuyXe}Zf*Qd$#plI7n8steEVaA!+mEj-cdpC+Q`n`M_oXb~H}-b1l;zE^
zZ>>q`MZrOd%D{LEnLq7peyexi!gJ5l{oJG{2d(lyC2lu=lgHBFqAN2dWNrF(<EzC}
eo-6gA*h7EVM=$VwuosxZ7(8A5T-G@yGywp9rYpSw
index ef6c6915a0cb07516dc96f3b5bf67d70d82042ac..5ed8034d899f179e3a20923e2ccbd3e959326add
GIT binary patch
literal 681
zc%17D@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFfz^z*OMr;uunK>+X!xS;2u4Zr#&w
z%u!pqRbZvKfJl?4;M7N~Q41e96ew_rI&N6uv6|x%_Y3J8d_iXp>}zONJ66T}we4E=
zEWT9}FKxfjIJNERKd#+zW!;i0>5J{xocXl==tG`!_k4Y~@|QlcpZn4==&54fnV3aE
z`%aiMmpbjX%iJzw%3k|MJxER^`Co+Tg@jd?ol};t6Z)Hd<qK;U+mWyP48P@B`(*EF
zezst#UdHsYtnFVV)Smu(T>H;*>E|A)6Z7XR&;ERH*U>e{)}6~M`dfS=(#k#U=!Th$
zmzHkUk@C6H*ybMjh2hDRXkNb?zZu)?=QL*9CNFf21c~I`$kbx{mh+O=*2iz>)dwwm
zt&cV}R^%kVNGv+Fwk`hfw7PrWnmMdbCH?igF<V%nrZsZE@V8$U9Px?Q-naP5GC$Nl
z^K0&gaCgTaT$}6E-#ir**mr2nea`BO?1#c<e6>zIUk#PHsR)(XCEv2%;C1<-d2gVa
zPu_(X8|KsaK{O3$&tnyc@wT@ZA%^g8Z-&S;uZ1Wr+b;|@#BS|-)d&Lt{zLz_<mKON
zxg*TE&mvJ+HiTzM@<VyIpp9}*%+6RPwwkrQ-*#~7wGaLIMW=El3g<`ktaF;<%6xL#
z2fjT;CpEWAh3!!~!QOL^Q$hO7WFDz{*A2!mo~0SI&na48RbIHe(_`PvMT~`(Rox*M
zoOLqRNBcxih`6=#?zPF;X+iHo4^Ml1ZSqO?6;c@nSO2hWIwraH=e#unigTlncRVc4
y)4k7orE~q`>={?zeLV5W`fEP_ydSxB4Es0z6WXv~ojWiIGI+ZBxvX<aXaWE@(Min!
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/awesomebar_tabs_bg.xml.in
+++ /dev/null
@@ -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>
--- a/mobile/android/base/resources/drawable/tabs_button.xml
+++ b/mobile/android/base/resources/drawable/tabs_button.xml
@@ -7,17 +7,17 @@
 
     <item android:maxLevel="1">
 
         <selector>
 
             <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>
 
     </item>
 
     <item android:maxLevel="2" android:drawable="@android:color/transparent"/>
 
 </level-list>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/tabs_tray_bg_repeat.xml
+++ /dev/null
@@ -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"/>
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/tabs_tray_dark_bg_repeat.xml
+++ /dev/null
@@ -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"/>
--- a/mobile/android/base/resources/layout-xlarge-v11/gecko_app.xml.in
+++ b/mobile/android/base/resources/layout-xlarge-v11/gecko_app.xml.in
@@ -7,17 +7,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
 
    <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"
          android:id="@+id/main_layout"
          style="@style/Screen.Transparent">
  
         <!-- BrowserToolbar will be added dynamically -->
         
@@ -26,17 +26,17 @@
                         android:layout_height="fill_parent"
                         android:layout_weight="1">
 
             <include layout="@layout/shared_ui_components"/>
 
             <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>
 
         <org.mozilla.gecko.FindInPageBar android:id="@+id/find_in_page"
                                          android:layout_width="fill_parent"
                                          android:layout_height="wrap_content"
                                          android:layout_gravity="bottom"
                                          style="@style/FindBar"
--- a/mobile/android/base/resources/layout-xlarge-v11/tabs_panel.xml.in
+++ b/mobile/android/base/resources/layout-xlarge-v11/tabs_panel.xml.in
@@ -9,17 +9,17 @@
 
     <RelativeLayout android:id="@+id/tabs_panel_header"
                     android:layout_width="fill_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <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"/>
 
         </view>
 
         <View android:layout_width="fill_parent"
               android:layout_height="2dp"
               android:layout_alignParentBottom="true"
@@ -62,17 +62,17 @@
 
     <RelativeLayout android:id="@+id/tabs_panel_footer"
                     android:layout_width="fill_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <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"/>
 
         </view>
 
         <View android:layout_width="fill_parent"
               android:layout_height="2dp"
               android:layout_alignParentTop="true"
--- a/mobile/android/base/resources/layout/awesomebar_tabs.xml
+++ b/mobile/android/base/resources/layout/awesomebar_tabs.xml
@@ -8,17 +8,17 @@
                                   android:layout_width="fill_parent"
                                   android:layout_height="fill_parent">
 
     <view class="org.mozilla.gecko.AwesomeBarTabs.Background"
           android:id="@+id/awesomebar_background"
           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"
                       android:layout_height="wrap_content">
 
             <View android:id="@+id/tab_widget_left"
                   style="@style/AwesomeBarTabIndicatorCurve.Left"/>
 
--- a/mobile/android/base/resources/layout/gecko_app.xml.in
+++ b/mobile/android/base/resources/layout/gecko_app.xml.in
@@ -7,17 +7,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent">
 
     <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"
          android:id="@+id/main_layout"
          style="@style/Screen.Transparent">
  
         <!-- BrowserToolbar will be added dynamically -->
 
@@ -26,17 +26,17 @@
                         android:layout_height="fill_parent"
                         android:layout_weight="1">
 
             <include layout="@layout/shared_ui_components"/>
 
             <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>
 
         <org.mozilla.gecko.FindInPageBar android:id="@+id/find_in_page"
                                          android:layout_width="fill_parent"
                                          android:layout_height="wrap_content"
                                          android:layout_gravity="bottom"
                                          style="@style/FindBar"
--- a/mobile/android/base/resources/layout/setup_screen.xml
+++ b/mobile/android/base/resources/layout/setup_screen.xml
@@ -1,16 +1,16 @@
 <?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/. -->
 
 <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" >
 
     <LinearLayout android:orientation="vertical"
                   android:layout_width="fill_parent"
                   android:layout_height="fill_parent"
                   android:gravity="center"
--- a/mobile/android/base/resources/layout/tabs_panel.xml.in
+++ b/mobile/android/base/resources/layout/tabs_panel.xml.in
@@ -9,17 +9,17 @@
 
     <RelativeLayout android:id="@+id/tabs_panel_header"
                     android:layout_width="fill_parent"
                     android:layout_height="@dimen/browser_toolbar_height">
 
         <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"/>
 
         </view>
 
         <View android:layout_width="fill_parent"
               android:layout_height="2dp"
               android:layout_alignParentBottom="true"
--- a/mobile/android/base/resources/values-v11/themes.xml
+++ b/mobile/android/base/resources/values-v11/themes.xml
@@ -39,17 +39,17 @@
     </style>
     
     <style name="Gecko.Translucent" parent="@android:style/Theme.Translucent">
         <item name="android:windowActionBar">true</item>
         <item name="android:windowNoTitle">false</item>
     </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>
         <item name="android:spinnerItemStyle">@style/SpinnerItem</item>
         <item name="android:spinnerDropDownItemStyle">@style/SpinnerDropDownItem</item>
     </style>
 
     <style name="Gecko.Light.AwesomeBar">
--- a/mobile/android/base/resources/values/colors.xml
+++ b/mobile/android/base/resources/values/colors.xml
@@ -1,14 +1,18 @@
 <?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/. -->
 
 <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>
   <color name="splash_urlfont">#000000</color>
   <color name="splash_content">#ffffff</color>
   <color name="doorhanger_text">#ffffff</color>
   <color name="doorhanger_link">#ACC4D5</color>
   <color name="validation_message_text">#ffffff</color>
--- a/mobile/android/base/resources/values/dimens.xml
+++ b/mobile/android/base/resources/values/dimens.xml
@@ -30,17 +30,17 @@
     <dimen name="doorhanger_arrow_width">44dp</dimen>
     <dimen name="flow_layout_spacing">6dp</dimen>
     <dimen name="menu_item_row_height">44dp</dimen>
     <dimen name="menu_item_row_width">240dp</dimen>
     <dimen name="menu_popup_arrow_margin">5dip</dimen>
     <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>
     <dimen name="prompt_service_inputs_padding">16dp</dimen>
     <dimen name="prompt_service_left_right_text_with_icon_padding">10dp</dimen>
     <dimen name="prompt_service_top_bottom_text_with_icon_padding">8dp</dimen>
     <dimen name="remote_tab_child_row_height">64dp</dimen>
     <dimen name="remote_tab_group_row_height">26dp</dimen>
--- a/mobile/android/base/resources/values/themes.xml
+++ b/mobile/android/base/resources/values/themes.xml
@@ -32,17 +32,17 @@
 
     <style name="Gecko.Light.NoActionBar" parent="Gecko.Light"/>
     
     <style name="Gecko.Translucent" parent="@android:style/Theme.Translucent">
         <item name="android:windowNoTitle">true</item>
     </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"/>
     
     <style name="Gecko.TitleBar.Preferences"/>
     
     <style name="Gecko.Translucent.TabsTray"/>