Backout 51119e80e283 (bug 822422), 1a7f21d5a95a (bug 822421) for java NPEs on a CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Wed, 19 Dec 2012 19:49:58 +0000
changeset 125649 80bb97dbfbd2fcb4e1f5927434bae45c8c5dcaa6
parent 125648 4faa85ebbbf7850500311b5d5efcab58db17f89b
child 125650 8c794d4722f7e8022a9ab80075c98afdd5677032
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs822422, 822421
milestone20.0a1
backs out51119e80e283943e1f465bf854a1c37045c8944c
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
Backout 51119e80e283 (bug 822422), 1a7f21d5a95a (bug 822421) for java NPEs on a CLOSED TREE
CLOBBER
mobile/android/base/AboutHomeContent.java
mobile/android/base/AboutHomeSection.java
mobile/android/base/GeckoView.java.frag
mobile/android/base/LightweightTheme.java
mobile/android/base/Makefile.in
mobile/android/base/resources/color/abouthome_section_more_text.xml.in
mobile/android/base/resources/color/abouthome_section_subtitle.xml.in
mobile/android/base/resources/color/abouthome_section_title.xml.in
mobile/android/base/resources/drawable-hdpi/abouthome_logo.png
mobile/android/base/resources/drawable-hdpi/abouthome_logo_dark.png
mobile/android/base/resources/drawable-hdpi/abouthome_logo_light.png
mobile/android/base/resources/drawable-xhdpi/abouthome_logo.png
mobile/android/base/resources/drawable-xhdpi/abouthome_logo_dark.png
mobile/android/base/resources/drawable-xhdpi/abouthome_logo_light.png
mobile/android/base/resources/drawable/abouthome_logo.png
mobile/android/base/resources/drawable/abouthome_logo.xml.in
mobile/android/base/resources/drawable/abouthome_logo_dark.png
mobile/android/base/resources/drawable/abouthome_logo_light.png
mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
mobile/android/base/resources/layout/abouthome_addon_row.xml
mobile/android/base/resources/layout/abouthome_content.xml.in
mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
mobile/android/base/resources/layout/abouthome_section.xml
mobile/android/base/resources/values/attrs.xml
--- a/CLOBBER
+++ b/CLOBBER
@@ -10,9 +10,9 @@
 #                  O   <-- Users coming from both parents need to Clobber
 #               /     \
 #          O               O
 #          |               |
 #          O <-- Clobber   O  <-- Clobber
 #
 # Note: The description below will be part of the error message shown to users.
 #
-Bug 822422 - Firefox workmark should be white on dark themes.
+Bug 816576 - libsoundtouch is now part of libxul and not a separate dynamic library.
--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -684,33 +684,21 @@ public class AboutHomeContent extends Sc
     @Override
     public void onLightweightThemeChanged() {
         LightweightThemeDrawable drawable = mActivity.getLightweightTheme().getColorDrawable(this);
         if (drawable == null)
             return;
 
          drawable.setAlpha(255, 0);
          setBackgroundDrawable(drawable);
-
-         boolean isLight = mActivity.getLightweightTheme().isLightTheme();
-         mAddons.setTheme(isLight);
-         mLastTabs.setTheme(isLight);
-         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);
-        mAddons.resetTheme();
-        mLastTabs.resetTheme();
-        mRemoteTabs.resetTheme();
-        ((GeckoImageView) findViewById(R.id.abouthome_logo)).resetTheme();
-        ((GeckoTextView) findViewById(R.id.top_sites_title)).resetTheme();
     }
 
     @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/AboutHomeSection.java
+++ b/mobile/android/base/AboutHomeSection.java
@@ -8,17 +8,17 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class AboutHomeSection extends GeckoLinearLayout {
+public class AboutHomeSection extends LinearLayout {
     private static final String LOGTAG = "GeckoAboutHomeSection";
 
     private TextView mTitle;
     private TextView mSubtitle;
     private LinearLayout mItemsContainer;
     private LinkTextView mMoreText;
 
     public AboutHomeSection(Context context, AttributeSet attrs) {
--- a/mobile/android/base/GeckoView.java.frag
+++ b/mobile/android/base/GeckoView.java.frag
@@ -5,68 +5,36 @@
 package org.mozilla.gecko;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.@VIEWTYPE@;
 
 public class Gecko@VIEWTYPE@ extends @VIEWTYPE@ {
     private static final int[] STATE_PRIVATE_MODE = { R.attr.state_private };
-    private static final int[] STATE_LIGHT = { R.attr.state_light };
-    private static final int[] STATE_DARK = { R.attr.state_dark };
 
     private boolean mIsPrivate = false;
-    private boolean mIsLight = false;
-    private boolean mIsDark = false;
 
     public Gecko@VIEWTYPE@(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
     @Override
     public int[] onCreateDrawableState(int extraSpace) {
         final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
 
         if (mIsPrivate)
             mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
-        else if (mIsLight)
-            mergeDrawableStates(drawableState, STATE_LIGHT);
-        else if (mIsDark)
-            mergeDrawableStates(drawableState, STATE_DARK);
 
         return drawableState;
     }
 
     public boolean isPrivateMode() {
         return mIsPrivate;
     }
 
     public void setPrivateMode(boolean isPrivate) {
         if (mIsPrivate != isPrivate) {
             mIsPrivate = isPrivate;
             refreshDrawableState();
         }
-    }
-
-    public void setTheme(boolean isLight) {
-        // Set the theme only if it is different from existing theme.
-        if ((isLight && mIsLight != isLight) ||
-            (!isLight && mIsDark == isLight)) {
-            if (isLight) {
-                mIsLight = true;
-                mIsDark = false;
-            } else {
-                mIsLight = false;
-                mIsDark = true;
-            }
-
-            refreshDrawableState();
-        }
-    }
-
-    public void resetTheme() {
-        if (mIsLight || mIsDark) {
-            mIsLight = false;
-            mIsDark = false;
-            refreshDrawableState();
-        }
-    } 
+   }
 }
--- a/mobile/android/base/LightweightTheme.java
+++ b/mobile/android/base/LightweightTheme.java
@@ -37,17 +37,16 @@ import java.util.ArrayList;
 import android.util.Log;
 
 public class LightweightTheme implements GeckoEventListener {
     private static final String LOGTAG = "GeckoLightweightTheme";
 
     private Application mApplication;
     private Bitmap mBitmap;
     private int mColor;
-    private boolean mIsLight;
 
     public static interface OnChangeListener {
         // This is the View's default post.
         // This is required to post the change/rest on UI thread.
         public boolean post(Runnable action);
 
         // The View should change its background/text color. 
         public void onLightweightThemeChanged();
@@ -94,21 +93,16 @@ public class LightweightTheme implements
             DisplayMetrics dm = mApplication.getResources().getDisplayMetrics();
             int maxWidth = Math.max(dm.widthPixels, dm.heightPixels);
             int height = (int) (mBitmap.getHeight() * 0.25);
             Bitmap cropped = Bitmap.createBitmap(mBitmap, mBitmap.getWidth() - maxWidth,
                                                           mBitmap.getHeight() - height, 
                                                           maxWidth, height);
             mColor = BitmapUtils.getDominantColor(cropped, false);
 
-            double luminance = (0.2125 * ((mColor & 0x00FF0000) >> 16)) + 
-                               (0.7154 * ((mColor & 0x0000FF00) >> 8)) + 
-                               (0.0721 * (mColor &0x000000FF));
-            mIsLight = (luminance > 110) ? true : false;
-
             notifyListeners();
         } catch(java.net.MalformedURLException e) {
             mBitmap = null;
         } catch(java.io.IOException e) {
             mBitmap = null;
         }
     }
 
@@ -157,20 +151,16 @@ public class LightweightTheme implements
             } else if (event.equals("LightweightTheme:Disable")) {
                 resetLightweightTheme();
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
         }
     }
 
-    public boolean isLightTheme() {
-        return mIsLight;
-    }
-
     /**
      * Crop the image based on the position of the view on the window.
      * Either the View or one of its ancestors might have scrolled or translated.
      * This value should be taken into account while mapping the View to the Bitmap.
      *
      * @param view The view requesting a cropped bitmap.
      */
     private Bitmap getCroppedBitmap(View view) {
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -222,22 +222,18 @@ FENNEC_PP_JAVA_FILES = \
   db/FormHistoryProvider.java \
   db/TabsProvider.java \
   db/GeckoProvider.java \
   SmsManager.java \
   UpdateServiceHelper.java \
   $(NULL)
 
 FENNEC_PP_XML_FILES = \
-  res/color/abouthome_section_more_text.xml \
-  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 \
@@ -496,18 +492,17 @@ RES_DRAWABLE_NODPI = \
   res/drawable-nodpi/tabs_tray_bg.png \
   res/drawable-nodpi/tabs_tray_selected_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 \
+  res/drawable/abouthome_logo.png \
   res/drawable/abouthome_promo_box_bg.9.png \
   res/drawable/abouthome_promo_box_pressed_bg.9.png \
   res/drawable/abouthome_promo_logo_apps.png \
   res/drawable/abouthome_promo_logo_sync.png \
   res/drawable/abouthome_thumbnail.png \
   res/drawable/abouthome_thumbnail_bg.png \
   res/drawable/address_bar_bg_shadow.png \
   res/drawable/alert_addon.png \
@@ -586,18 +581,17 @@ RES_DRAWABLE_LDPI = \
   $(NULL)
 
 RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/favicon.png \
   res/drawable-hdpi/folder.png \
   res/drawable-hdpi/home_bg.png \
   res/drawable-hdpi/home_star.png \
   res/drawable-hdpi/abouthome_icon.png \
-  res/drawable-hdpi/abouthome_logo_dark.png \
-  res/drawable-hdpi/abouthome_logo_light.png \
+  res/drawable-hdpi/abouthome_logo.png \
   res/drawable-hdpi/abouthome_promo_box_bg.9.png \
   res/drawable-hdpi/abouthome_promo_box_pressed_bg.9.png \
   res/drawable-hdpi/abouthome_promo_logo_apps.png \
   res/drawable-hdpi/abouthome_promo_logo_sync.png \
   res/drawable-hdpi/abouthome_thumbnail.png \
   res/drawable-hdpi/abouthome_thumbnail_bg.png \
   res/drawable-hdpi/address_bar_bg_shadow.png \
   res/drawable-hdpi/alert_addon.png \
@@ -666,18 +660,17 @@ RES_DRAWABLE_HDPI = \
   res/drawable-hdpi/handle_start.png \
   $(addprefix res/drawable-hdpi/,$(notdir $(SYNC_RES_DRAWABLE_HDPI))) \
   $(NULL)
 
 RES_DRAWABLE_XHDPI = \
   res/drawable-xhdpi/favicon.png \
   res/drawable-xhdpi/folder.png \
   res/drawable-xhdpi/abouthome_icon.png \
-  res/drawable-xhdpi/abouthome_logo_dark.png \
-  res/drawable-xhdpi/abouthome_logo_light.png \
+  res/drawable-xhdpi/abouthome_logo.png \
   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/address_bar_bg_shadow.png \
   res/drawable-xhdpi/address_bar_texture_port.png \
deleted file mode 100644
--- a/mobile/android/base/resources/color/abouthome_section_more_text.xml.in
+++ /dev/null
@@ -1,19 +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@">
-
-    <!-- dark theme -->
-    <item gecko:state_dark="true" android:color="#80FFFFFF" />
-
-    <!-- light theme -->
-    <item gecko:state_light="true" android:color="#80222222" />
-
-    <!-- default -->
-    <item android:color="#FF22629E"/>
-
-</selector>
deleted file mode 100644
--- a/mobile/android/base/resources/color/abouthome_section_subtitle.xml.in
+++ /dev/null
@@ -1,19 +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@">
-
-    <!-- dark theme -->
-    <item gecko:state_dark="true" android:color="#CCFFFFFF" />
-
-    <!-- light theme -->
-    <item gecko:state_light="true" android:color="#CC222222" />
-
-    <!-- default -->
-    <item android:color="#FF666666"/>
-
-</selector>
deleted file mode 100644
--- a/mobile/android/base/resources/color/abouthome_section_title.xml.in
+++ /dev/null
@@ -1,19 +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@">
-
-    <!-- dark theme -->
-    <item gecko:state_dark="true" android:color="#FFFFFFFF" />
-
-    <!-- light theme -->
-    <item gecko:state_light="true" android:color="#FF222222" />
-
-    <!-- default -->
-    <item android:color="#FF000000"/>
-
-</selector>
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a7e92b1d9e30202faef40868d7291c2bc95be468
GIT binary patch
literal 1434
zc$@*61!ek)P)<h;3K|Lk000e1NJLTq004Uc001Ni1^@s6sUJmM0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%JV``BRCwC#T<vk%KoC7={6C}uD-~EC
z`+sl+#uZpp5U2pC08s&=0!RhO|2-2@ft3oPR6y=Bd&%Xz?{xaWNW?pHW1F0gy?eWF
zKP2UBzuyaAxw*OVof^={Xmm|NIr?(+jL&j8QaN_VQtIjHsn+%94eO&0XDP?P_-rG`
zkPfR0AkPVCB+7Wlw69Ldx%Ad)1M9>D=EMS8(BJxi+AIp-ttV@RT?G5=`ucj`#5(lz
zhedrR1%7DpIVhc<f$rR1J|2Uq+Cbww>(J0)wpk*eqhh2L{eD67799ym2LU^`fDa1{
zqK$F~_H||LZ`M_ymAq?UjYs2m6qnl`uLI_@gaJ0|GT6woXEHuaE0kWUG`W@IGtpv3
zw72UZ*gwUI$@u}+OliEy3DWqR{KuYcHYjvWnh3s=)}#9N6O;T5=<|@S{Q_#+fYu0@
zq%if2v8ix3Qhdv|K9iu9(L=8j(ums(HtIm77T9y<V7}Al)MrcP(7rJs&&A6oj-62_
zjx5^MW0=seWk_q9dQ7M+bIFGE;PMxhA6*&_VjGHJ@~3BzYm7<1H5pDS^RMwCXuRj?
zA)E(jFW!RkZDZBN&jmnheMU4lY-o?19+Ag&O4qLhtSy)H?>2Z#0Q3|9y_3Mkq|c-7
z9mx5?F=O@@K*w9q+}Ih+5TQdT0Dap4;AS~iMGwswONK3Sa3&)Q=pI!&0<exguS+_!
zP#QpX=$P%241@qAD`O5i;2jy!d*CHKqPCA#coBe&GDgppF~3L;-K^pE6<Ik*PC%`J
zahOIn0uG_d<=-Jf{!Gaz{^{YP-gs&?OMFYLzTj^r+*)(dJoBJebj=;r>KV}>cX;;}
zz4j=cM;<X3#qJrPTtU<wc&?2Yfa|fZL1>C87NZ`%qVKD!30mJX_8y|1P7FFSzheM^
zo-tW^PKU!~>7N-u%E$l!Jp=0|MiOT;O=M-<L-F!Hy7uOUz&-q77whcQq4)#%Ja%N_
z3lJ{q+?aWA7^x_!;{&7fJ(xQOvHA~vcMa@CK?ctmM_z$>!kV7#N+6NprJjbD0^=Ak
zbF(tFc-z26zy*#h-6cE6dR6-fz6qx-k0sWed9FE>UhREjrs*3YhmyeIWnqKsRlV+8
zjlK05uh-eRD~XL&)_u$l+A)kEc*XClL;tDZJ94i138*M?^8Qltb|a*{(sLM>Z>RDN
z?2gE!fJv6rIQegAJQ07pT4f}w_<eazPc0M2M;_}f9i>`l!A6JtUA*pt5-7XBs1fgT
z0HRkJD7`z9iCS_>G>#7W(<|$d)yVEIJomN)>&3w6=lZVJDaCBxro^Ga&H(NDP;=3~
z27+(esP9zm--UzDPYUc6*l1KDW;S6M8%NFWqVS+#Ef;8G!@F5ylioc#C9pSu#)`65
z?NwhzwfoPuEF9T0GN!r5T5E89s*QrWW$3Z&NfDiQ32f9z=ovtURvcAczoij4XtFGo
z$H05Hj1Fso`}&%~M-H0*=f;o(d;>ySA)R-v&W;^48WHGw8qc)(K9c~|rE~NwS;*)x
z0ERm>3}WKgZ|0!&Qgq(MrpmBpxs{0eZ*^#}vWnN<8rLHF&H$4Mx}_PHrSmR=tq-g0
zdsiu4*VL;>>cFo=xmR~nx<<3Y)RAwD3-*Wh59$0ISWi{YLDra6oad4$S+}C^JAt1g
zOU2(uoLmQ2<qY)02I{*X1pj1AP6mN=n1OYjMx>H8>B09X)+_JU4;pGYJJ5f#aZKrx
o=N$6|yr6>d7E0asvwsON0FRE7|FK?$=Kufz07*qoM6N<$f(<0USpWb4
deleted file mode 100644
index a7e92b1d9e30202faef40868d7291c2bc95be468..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 15bdd9280dbe8127875f898e4635cd63a6923265..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b145af558ee14ea0d2a5046c85ebe32bb52b6303
GIT binary patch
literal 1876
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
O0000<MNUMnLSTZ)VR7OB
deleted file mode 100644
index b145af558ee14ea0d2a5046c85ebe32bb52b6303..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e07197aadbc8af411bc8b6e6241f8f7e03abf324..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..983bfe730cb86c822a210c8f160ca8e8106e78f3
GIT binary patch
literal 984
zc$@*)11J26P)<h;3K|Lk000e1NJLTq002_}000;W1^@s6hAqLb0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#dPzh<RCwC#SnX}wFc6gs51<XIOkfwz
z|5y`5o}lssi6%%qL6Qk9Phe#NEB_6cnIP%}Rwr=D;;CRCPBiWKt3VGp*!nt>kN56_
zoy}$w_{#P5wSC#w8fvYer<O=-f;lu&XjR7=aJgJMpLYg>!EgtAH6}aNnp*ebV=h9F
z6myW|S!;F<FuPh8JJ@@M7pB%d;~95a$0q`E=m65lYj7s%?)d%>qSZO%j;?d9GtmA<
zYx%E$so<F<JfxA?3FmB&TM;AjbM7*OS?ahDdnBM3RFANLQzoF0z`Pjge&X9a_%8<m
zvk&dzHzpbm5x+8ohQx|>Ci{;lGvC0=?Ie=pUA9|W-f6yhq`BGGX53q{{no;!$XeG|
zA)!W^nJH!WN8GFQ|I(C3n>}d0pxD*17Hn4s6HF{6j~-+4b4<Ri49hGA7?2)3*fIv#
z3x{nkq0C%9==qq~$7?n<?TgkYj2C}7u%~k-eIOtkuk%@Kh!QB-Vf@DSYKv_n_g0Bj
zVdHIivKTNVAZvi#cz39suwu`wS~9b7<J`kDjjV<8sm4x52nllnseqT%SmXoE=?dRQ
z<oSvU^pYBi#`Xm7rUX)ekW=74Z^8tO;Ps9)9);8a`Sg>&>F)_9KT`m(ZlP2ImMsj3
zz2FUj7gOA0+utbma`&Y0PLm5(La3Sggu+A9T#{H=Ot7U!oe2rgM>r%DG<F~)w!W31
z6wy5-AZu5r*KO&&rDA<w;l=c}#93*)p66IMbp7sVK86HnWhJ`XmJOVk*yszUa%J-)
z6y1U6*+96b?P>=w3(DjRvS;Z1>>B(OG`~doxyQzsIx{?02XrV=LMS+7nAwLpbK!o3
zDkHljFd4Y)h$lUfXKbygHg5awUVG=O>2@xK=I@SEpwG&iXX1)lJb#EfmrJ9+%C<JT
zp94%TcE39kOyuwqAKQtC%?e;j^nO9xS<?4Umjb2|CbyskhA2^1f%{b5$M$qfJe*mL
z0w3=^TAh$BsrJs~QnLA2D4ahmT_bjdpkBIz?M!GA*4VH$)sG5*C4v`^sTR(+(fwRt
zR_Kf>4_X%jeYbh%hyV?R*xa<ak>LG>kQ6h)=9IH}xkm}24p7E4J#mV-*(b0|P_T4#
zOv-V3bp`KEXoDKNxpjJ^1mL79B*R?)0IIz+YPzCd0t^5cjvb3E-a+300000<MNUMn
GLSTZL#Lx%;
deleted file mode 100644
--- a/mobile/android/base/resources/drawable/abouthome_logo.xml.in
+++ /dev/null
@@ -1,19 +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@">
-
-    <!-- dark theme -->
-    <item gecko:state_dark="true" android:drawable="@drawable/abouthome_logo_light" />
-
-    <!-- light theme -->
-    <item gecko:state_light="true" android:drawable="@drawable/abouthome_logo_dark" />
-
-    <!-- default -->
-    <item android:drawable="@drawable/abouthome_logo_dark" />
-
-</selector>
deleted file mode 100644
index 983bfe730cb86c822a210c8f160ca8e8106e78f3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6a4bfaad4bde8731ed5d91536fb6e4654198f5d3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout-xlarge-land-v11/abouthome_content.xml.in
@@ -13,34 +13,33 @@
 
         <LinearLayout android:orientation="vertical"
                       android:layout_width="0dp"
                       android:layout_height="fill_parent"
                       android:layout_weight="0.6"
                       android:layout_marginLeft="@dimen/abouthome_gutter_large"
                       android:layout_marginRight="@dimen/abouthome_gutter_small">
 
-            <Gecko.ImageView android:id="@+id/abouthome_logo"
-                             android:src="@drawable/abouthome_logo"
-                             android:layout_width="wrap_content"
-                             android:layout_height="24dip"
-                             android:layout_marginTop="16dip"
-                             android:layout_marginBottom="10dip"
-                             android:layout_marginLeft="12dip"/>
+            <ImageView android:src="@drawable/abouthome_logo"
+                       android:layout_width="wrap_content"
+                       android:layout_height="24dip"
+                       android:layout_marginTop="16dip"
+                       android:layout_marginBottom="10dip"
+                       android:layout_marginLeft="12dip"/>
 
-            <Gecko.TextView android:id="@+id/top_sites_title"
-                            android:text="@string/abouthome_top_sites_title"
-                            android:layout_width="fill_parent"
-                            android:layout_height="26dip"
-                            android:background="#34FFFFFF"
-                            android:paddingLeft="12dip"
-                            android:textSize="12sp"
-                            android:textColor="@color/abouthome_section_title"
-                            android:textStyle="bold"
-                            android:gravity="left|center_vertical"/>
+            <TextView android:id="@+id/top_sites_title"
+                      android:text="@string/abouthome_top_sites_title"
+                      android:layout_width="fill_parent"
+                      android:layout_height="26dip"
+                      android:background="#34FFFFFF"
+                      android:paddingLeft="12dip"
+                      android:textSize="12sp"
+                      android:textColor="#000000"
+                      android:textStyle="bold"
+                      android:gravity="left|center_vertical"/>
 
             <view class="org.mozilla.gecko.AboutHomeContent$TopSitesGridView"
                   android:id="@+id/top_sites_grid"
                   style="@style/AboutHome.Thumbnail.Grid"/>
 
             <org.mozilla.gecko.AboutHomePromoBox android:id="@+id/promo_box"
                                                  android:orientation="horizontal"
                                                  android:background="@drawable/abouthome_promo_box"
--- a/mobile/android/base/resources/layout/abouthome_addon_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_addon_row.xml
@@ -2,45 +2,42 @@
 <!-- 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/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="fill_parent"
                 android:layout_height="47dip"
                 android:gravity="left|center_vertical"
-                android:background="@drawable/action_bar_button"
-                android:duplicateParentState="true">
+                android:background="@drawable/action_bar_button">
 
     <ImageView android:id="@+id/addon_icon"
                android:layout_width="32dp"
                android:layout_height="32dp"
                android:layout_centerVertical="true"
                android:layout_marginLeft="12dip"
                android:src="@drawable/ic_addons_empty"/>
 
     <TextView android:id="@+id/addon_title"
               android:layout_width="wrap_content"
               android:layout_height="fill_parent"
               android:layout_toRightOf="@id/addon_icon"
               android:layout_marginLeft="12dip"
               android:gravity="center_vertical"
               android:textSize="15sp"
-              android:textColor="@color/abouthome_section_title"
-              android:duplicateParentState="true"/>
+              android:textColor="#222222"/>
 
     <TextView android:id="@+id/addon_version"
               android:layout_width="wrap_content"
               android:layout_height="fill_parent"
               android:layout_toRightOf="@id/addon_title"
               android:layout_alignBottom="@id/addon_title"
               android:layout_marginLeft="5dip"
               android:gravity="center_vertical"
               android:textSize="12sp"
-              android:textColor="@color/abouthome_section_subtitle"
-              android:duplicateParentState="true"/>
+              android:textColor="#666666"/>
 
     <View android:layout_width="fill_parent"
           android:layout_height="1dp"
           android:background="@drawable/abouthome_divider"
           android:layout_alignParentBottom="true"/>
 
 </RelativeLayout>
--- a/mobile/android/base/resources/layout/abouthome_content.xml.in
+++ b/mobile/android/base/resources/layout/abouthome_content.xml.in
@@ -7,37 +7,37 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
 
     <RelativeLayout android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
                     android:paddingLeft="@dimen/abouthome_gutter_large"
                     android:paddingRight="@dimen/abouthome_gutter_large">
 
-        <Gecko.ImageView android:id="@+id/abouthome_logo"
-                         android:src="@drawable/abouthome_logo"
-                         android:layout_width="wrap_content"
-                         android:layout_height="24dip"
-                         android:layout_marginTop="16dip"
-                         android:layout_marginBottom="10dip"
-                         android:layout_marginLeft="12dip"
-                         android:layout_alignParentTop="true"
-                         android:layout_alignParentLeft="true"/>
+        <ImageView android:id="@+id/abouthome_logo"
+                   android:src="@drawable/abouthome_logo"
+                   android:layout_width="wrap_content"
+                   android:layout_height="24dip"
+                   android:layout_marginTop="16dip"
+                   android:layout_marginBottom="10dip"
+                   android:layout_marginLeft="12dip"
+                   android:layout_alignParentTop="true"
+                   android:layout_alignParentLeft="true"/>
 
-        <Gecko.TextView android:id="@+id/top_sites_title"
-                        android:text="@string/abouthome_top_sites_title"
-                        android:layout_width="fill_parent"
-                        android:layout_height="26dip"
-                        android:background="#34FFFFFF"
-                        android:paddingLeft="12dip"
-                        android:textSize="12sp"
-                        android:textColor="@color/abouthome_section_title"
-                        android:textStyle="bold"
-                        android:gravity="left|center_vertical"
-                        android:layout_below="@id/abouthome_logo"/>
+        <TextView android:id="@+id/top_sites_title"
+                  android:text="@string/abouthome_top_sites_title"
+                  android:layout_width="fill_parent"
+                  android:layout_height="26dip"
+                  android:background="#34FFFFFF"
+                  android:paddingLeft="12dip"
+                  android:textSize="12sp"
+                  android:textColor="#000000"
+                  android:textStyle="bold"
+                  android:gravity="left|center_vertical"
+                  android:layout_below="@id/abouthome_logo"/>
 
         <ImageView android:src="@drawable/abouthome_icon"
                    android:layout_width="180dp"
                    android:layout_height="153dp"
                    android:layout_marginTop="4dp"
                    android:layout_marginRight="@dimen/abouthome_icon_crop"
                    android:layout_alignParentTop="true"
                    android:layout_alignParentRight="true"/>
--- a/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_last_tabs_row.xml
@@ -3,18 +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/. -->
 
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="fill_parent"
                 android:layout_height="47dip"
                 android:gravity="left|center_vertical"
-                android:background="@drawable/action_bar_button"
-                android:duplicateParentState="true">
+                android:background="@drawable/action_bar_button">
 
     <ImageView android:id="@+id/last_tab_favicon"
                android:layout_width="32dip"
                android:layout_height="32dip"
                android:layout_centerVertical="true"
                android:layout_marginLeft="12dip"
                android:src="@drawable/favicon"/>
 
@@ -22,29 +21,27 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_toRightOf="@id/last_tab_favicon"
               android:layout_marginTop="2dip"
               android:layout_marginLeft="12dip"
               android:layout_marginRight="12dip"
               android:textSize="15sp"
               android:singleLine="true"
-              android:textColor="@color/abouthome_section_title"
-              android:duplicateParentState="true"/>
+              android:textColor="#222222"/>
 
     <TextView android:id="@+id/last_tab_url"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginLeft="12dip"
               android:layout_marginRight="12dip"
               android:layout_toRightOf="@id/last_tab_favicon"
               android:layout_below="@id/last_tab_title"
               android:textSize="12sp"
               android:singleLine="true"
-              android:textColor="@color/abouthome_section_subtitle"
-              android:duplicateParentState="true"/>
+              android:textColor="#666666"/>
 
     <View android:layout_width="fill_parent"
           android:layout_height="1dp"
           android:background="@drawable/abouthome_divider"
           android:layout_alignParentBottom="true"/>
 
 </RelativeLayout>
--- a/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
+++ b/mobile/android/base/resources/layout/abouthome_remote_tab_row.xml
@@ -2,29 +2,27 @@
 <!-- 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/. -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="fill_parent"
                 android:layout_height="47dip"
                 android:orientation="vertical"
-                android:background="@drawable/action_bar_button"
-                android:duplicateParentState="true">
+                android:background="@drawable/action_bar_button">
 
     <TextView android:id="@+id/remote_tab_title"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
               android:paddingLeft="12dip"
               android:paddingRight="12dip"
               android:gravity="center_vertical"
               android:textSize="15sp"
+              android:textColor="#222222"
               android:singleLine="true"
-              android:ellipsize="middle"
-              android:textColor="@color/abouthome_section_title"
-              android:duplicateParentState="true"/>
+              android:ellipsize="middle"/>
 
     <View android:layout_width="fill_parent"
           android:layout_height="1dp"
           android:background="@drawable/abouthome_divider"
           android:layout_alignParentBottom="true"/>
 
 </RelativeLayout>
--- a/mobile/android/base/resources/layout/abouthome_section.xml
+++ b/mobile/android/base/resources/layout/abouthome_section.xml
@@ -6,40 +6,36 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView android:id="@+id/title"
               android:layout_width="fill_parent"
               android:layout_height="26dip"
               android:background="#34FFFFFF"
               android:paddingLeft="12dip"
               android:textSize="12sp"
-              android:textColor="@color/abouthome_section_title"
+              android:textColor="#000000"
               android:textStyle="bold"
-              android:gravity="left|center_vertical"
-              android:duplicateParentState="true"/>
+              android:gravity="left|center_vertical"/>
 
     <TextView android:id="@+id/subtitle"
               android:layout_width="fill_parent"
               android:layout_height="26dip"
               android:layout_marginTop="1dip"
               android:background="#34FFFFFF"
               android:paddingLeft="12dip"
               android:textSize="12sp"
-              android:textColor="@color/abouthome_section_subtitle"
-              android:gravity="left|center_vertical"
-              android:duplicateParentState="true"/>
+              android:textColor="#666666"
+              android:gravity="left|center_vertical"/>
 
     <LinearLayout android:id="@+id/items_container"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:orientation="vertical"
-                  android:isScrollContainer="false"
-                  android:duplicateParentState="true"/>
+                  android:isScrollContainer="false"/>
 
     <org.mozilla.gecko.LinkTextView android:id="@+id/more_text"
                                     android:layout_width="fill_parent"
                                     android:layout_height="47dip"
-                                    android:textColor="@color/abouthome_section_more_text"
+                                    android:textColor="#22629e"
                                     android:textSize="12sp"
-                                    android:gravity="center"
-                                    android:duplicateParentState="true"/>
+                                    android:gravity="center"/>
 
 </merge>
--- a/mobile/android/base/resources/values/attrs.xml
+++ b/mobile/android/base/resources/values/attrs.xml
@@ -56,15 +56,10 @@
             <flag name="end" value="0x03" />
         </attr>
     </declare-styleable>
 
     <declare-styleable name="PrivateBrowsing">
         <attr name="state_private" format="boolean"/>
     </declare-styleable>
 
-    <declare-styleable name="LightweightTheme">
-        <attr name="state_light" format="boolean"/>
-        <attr name="state_dark" format="boolean"/>
-    </declare-styleable>
-
 </resources>