diff --git a/CLOBBER b/CLOBBER
index ac67b3b51e68..dadd3525b39a 100644
--- a/CLOBBER
+++ b/CLOBBER
@@ -15,4 +15,4 @@
#
# 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.
diff --git a/mobile/android/base/AboutHomeContent.java b/mobile/android/base/AboutHomeContent.java
index 387a8ea36b22..e520c3e30526 100644
--- a/mobile/android/base/AboutHomeContent.java
+++ b/mobile/android/base/AboutHomeContent.java
@@ -689,23 +689,11 @@ public class AboutHomeContent extends ScrollView
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
diff --git a/mobile/android/base/AboutHomeSection.java b/mobile/android/base/AboutHomeSection.java
index dcbbb674289c..c812131709bd 100644
--- a/mobile/android/base/AboutHomeSection.java
+++ b/mobile/android/base/AboutHomeSection.java
@@ -13,7 +13,7 @@ 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;
diff --git a/mobile/android/base/GeckoView.java.frag b/mobile/android/base/GeckoView.java.frag
index 8793d39dd821..d85a634d2252 100644
--- a/mobile/android/base/GeckoView.java.frag
+++ b/mobile/android/base/GeckoView.java.frag
@@ -10,12 +10,8 @@ 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);
@@ -27,10 +23,6 @@ public class Gecko@VIEWTYPE@ extends @VIEWTYPE@ {
if (mIsPrivate)
mergeDrawableStates(drawableState, STATE_PRIVATE_MODE);
- else if (mIsLight)
- mergeDrawableStates(drawableState, STATE_LIGHT);
- else if (mIsDark)
- mergeDrawableStates(drawableState, STATE_DARK);
return drawableState;
}
@@ -44,29 +36,5 @@ public class Gecko@VIEWTYPE@ extends @VIEWTYPE@ {
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();
- }
- }
+ }
}
diff --git a/mobile/android/base/LightweightTheme.java b/mobile/android/base/LightweightTheme.java
index 2fd44cc8d3e1..96a89b38f7a7 100644
--- a/mobile/android/base/LightweightTheme.java
+++ b/mobile/android/base/LightweightTheme.java
@@ -42,7 +42,6 @@ public class LightweightTheme implements GeckoEventListener {
private Application mApplication;
private Bitmap mBitmap;
private int mColor;
- private boolean mIsLight;
public static interface OnChangeListener {
// This is the View's default post.
@@ -99,11 +98,6 @@ public class LightweightTheme implements GeckoEventListener {
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;
@@ -162,10 +156,6 @@ public class LightweightTheme implements GeckoEventListener {
}
}
- 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.
diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in
index 234c9b6066db..d218029d4bda 100644
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -227,12 +227,8 @@ FENNEC_PP_JAVA_FILES = \
$(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 \
@@ -501,8 +497,7 @@ 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 \
@@ -591,8 +586,7 @@ RES_DRAWABLE_HDPI = \
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 \
@@ -671,8 +665,7 @@ 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 \
diff --git a/mobile/android/base/resources/color/abouthome_section_more_text.xml.in b/mobile/android/base/resources/color/abouthome_section_more_text.xml.in
deleted file mode 100644
index 3c636a48fcec..000000000000
--- a/mobile/android/base/resources/color/abouthome_section_more_text.xml.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#filter substitution
-
-
-
-
-
-
-