diff --git a/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tab_new_dark.png b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tab_new_dark.png new file mode 100644 index 00000000000..b29e972af98 Binary files /dev/null and b/mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tab_new_dark.png differ diff --git a/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tab_new_dark.png b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tab_new_dark.png new file mode 100644 index 00000000000..e674cd8553b Binary files /dev/null and b/mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tab_new_dark.png differ diff --git a/mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_add_tab.xml b/mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_add_tab.xml new file mode 100644 index 00000000000..ab50df40bc7 --- /dev/null +++ b/mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_add_tab.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tab_new_dark.png b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tab_new_dark.png new file mode 100644 index 00000000000..a7aa51e4875 Binary files /dev/null and b/mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tab_new_dark.png differ diff --git a/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml index 09c8fa7fa27..d37a76b64ce 100644 --- a/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml +++ b/mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml @@ -14,11 +14,11 @@ - diff --git a/mobile/android/base/tabs/TabStrip.java b/mobile/android/base/tabs/TabStrip.java index 5faf13e9536..a58ec618785 100644 --- a/mobile/android/base/tabs/TabStrip.java +++ b/mobile/android/base/tabs/TabStrip.java @@ -14,21 +14,18 @@ import android.view.LayoutInflater; import android.view.TouchDelegate; import android.view.View; import android.view.ViewTreeObserver; -import android.widget.ImageButton; import org.mozilla.gecko.R; import org.mozilla.gecko.Tab; import org.mozilla.gecko.Tabs; +import org.mozilla.gecko.widget.ThemedImageButton; import org.mozilla.gecko.widget.ThemedLinearLayout; public class TabStrip extends ThemedLinearLayout { private static final String LOGTAG = "GeckoTabStrip"; - private static final int IMAGE_LEVEL_NORMAL = 0; - private static final int IMAGE_LEVEL_PRIVATE = 1; - private final TabStripView tabStripView; - private final ImageButton addTabButton; + private final ThemedImageButton addTabButton; private final TabsListener tabsListener; @@ -43,7 +40,7 @@ public class TabStrip extends ThemedLinearLayout { LayoutInflater.from(context).inflate(R.layout.tab_strip, this); tabStripView = (TabStripView) findViewById(R.id.tab_strip); - addTabButton = (ImageButton) findViewById(R.id.add_tab); + addTabButton = (ThemedImageButton) findViewById(R.id.add_tab); addTabButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -97,7 +94,7 @@ public class TabStrip extends ThemedLinearLayout { @Override public void setPrivateMode(boolean isPrivate) { super.setPrivateMode(isPrivate); - addTabButton.setImageLevel(isPrivate ? IMAGE_LEVEL_PRIVATE : IMAGE_LEVEL_NORMAL); + addTabButton.setPrivateMode(isPrivate); } private class TabsListener implements Tabs.OnTabsChangedListener {