Bug 806937: Private browsing mode for Tabs button. [r=mfinkle]
--HG-- rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_button.xml.in rename : mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml => mobile/android/base/resources/drawable-xlarge-mdpi-v11/tabs_level.xml.in rename : mobile/android/base/resources/drawable/tabs_button.xml => mobile/android/base/resources/drawable/tabs_button.xml.in rename : mobile/android/base/resources/drawable/tabs_level.xml => mobile/android/base/resources/drawable/tabs_level.xml.in
@ -39,7 +39,6 @@ import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.PopupWindow;
|
||||
import android.widget.RelativeLayout;
|
||||
import android.widget.TextSwitcher;
|
||||
import android.widget.TextView;
|
||||
import android.widget.ViewSwitcher;
|
||||
|
||||
@ -60,7 +59,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
|
||||
private int mTitlePadding;
|
||||
private boolean mSiteSecurityVisible;
|
||||
private boolean mAnimateSiteSecurity;
|
||||
private ImageButton mTabs;
|
||||
private GeckoImageButton mTabs;
|
||||
private int mTabsPaneWidth;
|
||||
private ImageView mBack;
|
||||
private ImageView mForward;
|
||||
@ -69,7 +68,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
|
||||
public ImageButton mSiteSecurity;
|
||||
public ImageButton mReader;
|
||||
private AnimationDrawable mProgressSpinner;
|
||||
private TextSwitcher mTabsCount;
|
||||
private GeckoTextSwitcher mTabsCount;
|
||||
private ImageView mShadow;
|
||||
private ImageButton mMenu;
|
||||
private LinearLayout mActionItemBar;
|
||||
@ -179,7 +178,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
|
||||
}
|
||||
});
|
||||
|
||||
mTabs = (ImageButton) mLayout.findViewById(R.id.tabs);
|
||||
mTabs = (GeckoImageButton) mLayout.findViewById(R.id.tabs);
|
||||
mTabs.setOnClickListener(new Button.OnClickListener() {
|
||||
public void onClick(View v) {
|
||||
toggleTabs();
|
||||
@ -187,7 +186,7 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
|
||||
});
|
||||
mTabs.setImageLevel(0);
|
||||
|
||||
mTabsCount = (TextSwitcher) mLayout.findViewById(R.id.tabs_count);
|
||||
mTabsCount = (GeckoTextSwitcher) mLayout.findViewById(R.id.tabs_count);
|
||||
mTabsCount.removeAllViews();
|
||||
mTabsCount.setFactory(this);
|
||||
mTabsCount.setText("");
|
||||
@ -472,13 +471,17 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
|
||||
mCount = count;
|
||||
mHandler.postDelayed(new Runnable() {
|
||||
public void run() {
|
||||
((TextView) mTabsCount.getCurrentView()).setTextColor(mActivity.getResources().getColor(R.color.url_bar_text_highlight));
|
||||
GeckoTextView view = (GeckoTextView) mTabsCount.getCurrentView();
|
||||
view.setSelected(true);
|
||||
view.setPrivateMode(false);
|
||||
}
|
||||
}, mDuration);
|
||||
|
||||
mHandler.postDelayed(new Runnable() {
|
||||
public void run() {
|
||||
((TextView) mTabsCount.getCurrentView()).setTextColor(mActivity.getResources().getColor(R.color.tabs_counter_color));
|
||||
GeckoTextView view = (GeckoTextView) mTabsCount.getCurrentView();
|
||||
view.setSelected(false);
|
||||
view.setPrivateMode(Tabs.getInstance().getSelectedTab().isPrivate());
|
||||
}
|
||||
}, 2 * mDuration);
|
||||
}
|
||||
@ -792,6 +795,9 @@ public class BrowserToolbar implements ViewSwitcher.ViewFactory,
|
||||
else if (mAwesomeBar instanceof GeckoRelativeLayout)
|
||||
((GeckoRelativeLayout) mAwesomeBar).setPrivateMode(tab.isPrivate());
|
||||
|
||||
mTabs.setPrivateMode(tab.isPrivate());
|
||||
mTabsCount.setPrivateMode(tab.isPrivate());
|
||||
((GeckoTextView) mTabsCount.getCurrentView()).setPrivateMode(tab.isPrivate());
|
||||
mTitle.setPrivateMode(tab.isPrivate());
|
||||
}
|
||||
}
|
||||
|
@ -96,6 +96,8 @@ public final class GeckoViewsFactory implements LayoutInflater.Factory {
|
||||
return new GeckoLinearLayout(context, attrs);
|
||||
else if (TextUtils.equals(viewName, "RelativeLayout"))
|
||||
return new GeckoRelativeLayout(context, attrs);
|
||||
else if (TextUtils.equals(viewName, "TextSwitcher"))
|
||||
return new GeckoTextSwitcher(context, attrs);
|
||||
else if (TextUtils.equals(viewName, "TextView"))
|
||||
return new GeckoTextView(context, attrs);
|
||||
else
|
||||
|
@ -196,6 +196,7 @@ FENNEC_PP_JAVA_VIEW_FILES = \
|
||||
GeckoFrameLayout.java \
|
||||
GeckoLinearLayout.java \
|
||||
GeckoRelativeLayout.java \
|
||||
GeckoTextSwitcher.java \
|
||||
GeckoTextView.java \
|
||||
$(NULL)
|
||||
|
||||
@ -222,8 +223,13 @@ FENNEC_PP_JAVA_FILES = \
|
||||
FENNEC_PP_XML_FILES = \
|
||||
res/color/awesome_bar_title.xml \
|
||||
res/color/awesome_bar_title_hint.xml \
|
||||
res/color/tabs_counter_color.xml \
|
||||
res/drawable/address_bar_bg.xml \
|
||||
res/drawable/address_bar_url.xml \
|
||||
res/drawable/tabs_button.xml \
|
||||
res/drawable/tabs_level.xml \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_button.xml \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_level.xml \
|
||||
res/layout/abouthome_content.xml \
|
||||
res/layout/awesomebar_search.xml \
|
||||
res/layout/awesomebar_suggestion_row.xml \
|
||||
@ -478,6 +484,7 @@ RES_ANIM = \
|
||||
RES_DRAWABLE_NODPI = \
|
||||
res/drawable-nodpi/abouthome_bg.png \
|
||||
res/drawable-nodpi/tabs_tray_bg.png \
|
||||
res/drawable-nodpi/tabs_tray_bg_pb.png \
|
||||
res/drawable-nodpi/tabs_tray_selected_bg.png \
|
||||
$(NULL)
|
||||
|
||||
@ -524,6 +531,7 @@ RES_DRAWABLE_BASE = \
|
||||
res/drawable/tab_thumbnail_default.png \
|
||||
res/drawable/tab_thumbnail_shadow.png \
|
||||
res/drawable/tabs_carat.png \
|
||||
res/drawable/tabs_carat_pb.png \
|
||||
res/drawable/address_bar_back_button.xml \
|
||||
res/drawable/address_bar_back_button_bg.xml \
|
||||
res/drawable/address_bar_back_button_pressed_bg.xml \
|
||||
@ -604,6 +612,7 @@ RES_DRAWABLE_HDPI = \
|
||||
res/drawable-hdpi/tab_thumbnail_default.png \
|
||||
res/drawable-hdpi/tab_thumbnail_shadow.png \
|
||||
res/drawable-hdpi/tabs_carat.png \
|
||||
res/drawable-hdpi/tabs_carat_pb.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 \
|
||||
@ -675,6 +684,7 @@ RES_DRAWABLE_XHDPI = \
|
||||
res/drawable-xhdpi/tab_thumbnail_default.png \
|
||||
res/drawable-xhdpi/tab_thumbnail_shadow.png \
|
||||
res/drawable-xhdpi/tabs_carat.png \
|
||||
res/drawable-xhdpi/tabs_carat_pb.png \
|
||||
res/drawable-xhdpi/doorhanger_arrow.png \
|
||||
res/drawable-xhdpi/doorhanger_bg.9.png \
|
||||
res/drawable-xhdpi/doorhanger_shadow_bg.9.png \
|
||||
@ -819,6 +829,7 @@ RES_DRAWABLE_LAND_MDPI_V14 = \
|
||||
res/drawable-land-mdpi-v14/remote_tabs_on.png \
|
||||
res/drawable-land-mdpi-v14/tab_new.png \
|
||||
res/drawable-land-mdpi-v14/tabs_carat.png \
|
||||
res/drawable-land-mdpi-v14/tabs_carat_pb.png \
|
||||
res/drawable-land-mdpi-v14/urlbar_stop.png \
|
||||
res/drawable-land-mdpi-v14/menu.png \
|
||||
res/drawable-land-mdpi-v14/reader.png \
|
||||
@ -839,6 +850,7 @@ RES_DRAWABLE_LAND_HDPI_V14 = \
|
||||
res/drawable-land-hdpi-v14/remote_tabs_on.png \
|
||||
res/drawable-land-hdpi-v14/tab_new.png \
|
||||
res/drawable-land-hdpi-v14/tabs_carat.png \
|
||||
res/drawable-land-hdpi-v14/tabs_carat_pb.png \
|
||||
res/drawable-land-hdpi-v14/urlbar_stop.png \
|
||||
res/drawable-land-hdpi-v14/menu.png \
|
||||
res/drawable-land-hdpi-v14/reader.png \
|
||||
@ -859,6 +871,7 @@ RES_DRAWABLE_LAND_XHDPI_V14 = \
|
||||
res/drawable-land-xhdpi-v14/remote_tabs_on.png \
|
||||
res/drawable-land-xhdpi-v14/tab_new.png \
|
||||
res/drawable-land-xhdpi-v14/tabs_carat.png \
|
||||
res/drawable-land-xhdpi-v14/tabs_carat_pb.png \
|
||||
res/drawable-land-xhdpi-v14/urlbar_stop.png \
|
||||
res/drawable-land-xhdpi-v14/menu.png \
|
||||
res/drawable-land-xhdpi-v14/reader.png \
|
||||
@ -892,6 +905,7 @@ RES_DRAWABLE_LARGE_MDPI_V11 = \
|
||||
res/drawable-large-mdpi-v11/site_security_verified.png \
|
||||
res/drawable-large-mdpi-v11/menu.png \
|
||||
res/drawable-large-mdpi-v11/tabs_carat.png \
|
||||
res/drawable-large-mdpi-v11/tabs_carat_pb.png \
|
||||
$(NULL)
|
||||
|
||||
RES_DRAWABLE_LARGE_HDPI_V11 = \
|
||||
@ -918,6 +932,7 @@ RES_DRAWABLE_LARGE_HDPI_V11 = \
|
||||
res/drawable-large-hdpi-v11/site_security_verified.png \
|
||||
res/drawable-large-hdpi-v11/menu.png \
|
||||
res/drawable-large-hdpi-v11/tabs_carat.png \
|
||||
res/drawable-large-hdpi-v11/tabs_carat_pb.png \
|
||||
$(NULL)
|
||||
|
||||
RES_DRAWABLE_LARGE_XHDPI_V11 = \
|
||||
@ -944,6 +959,7 @@ RES_DRAWABLE_LARGE_XHDPI_V11 = \
|
||||
res/drawable-large-xhdpi-v11/site_security_verified.png \
|
||||
res/drawable-large-xhdpi-v11/menu.png \
|
||||
res/drawable-large-xhdpi-v11/tabs_carat.png \
|
||||
res/drawable-large-xhdpi-v11/tabs_carat_pb.png \
|
||||
$(NULL)
|
||||
|
||||
RES_DRAWABLE_XLARGE_MDPI_V11 = \
|
||||
@ -951,10 +967,10 @@ RES_DRAWABLE_XLARGE_MDPI_V11 = \
|
||||
res/drawable-xlarge-mdpi-v11/awesomebar_tab_left.9.png \
|
||||
res/drawable-xlarge-mdpi-v11/awesomebar_tab_right.9.png \
|
||||
res/drawable-xlarge-mdpi-v11/menu.png \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_button.xml \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_carat_contracted.png \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_carat_contracted_pb.png \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_carat_expanded.png \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_level.xml \
|
||||
res/drawable-xlarge-mdpi-v11/tabs_carat_expanded_pb.png \
|
||||
$(NULL)
|
||||
|
||||
RES_DRAWABLE_XLARGE_HDPI_V11 = \
|
||||
@ -963,7 +979,9 @@ RES_DRAWABLE_XLARGE_HDPI_V11 = \
|
||||
res/drawable-xlarge-hdpi-v11/awesomebar_tab_right.9.png \
|
||||
res/drawable-xlarge-hdpi-v11/menu.png \
|
||||
res/drawable-xlarge-hdpi-v11/tabs_carat_contracted.png \
|
||||
res/drawable-xlarge-hdpi-v11/tabs_carat_contracted_pb.png \
|
||||
res/drawable-xlarge-hdpi-v11/tabs_carat_expanded.png \
|
||||
res/drawable-xlarge-hdpi-v11/tabs_carat_expanded_pb.png \
|
||||
$(NULL)
|
||||
|
||||
RES_DRAWABLE_XLARGE_XHDPI_V11 = \
|
||||
@ -972,7 +990,9 @@ RES_DRAWABLE_XLARGE_XHDPI_V11 = \
|
||||
res/drawable-xlarge-xhdpi-v11/awesomebar_tab_right.9.png \
|
||||
res/drawable-xlarge-xhdpi-v11/menu.png \
|
||||
res/drawable-xlarge-xhdpi-v11/tabs_carat_contracted.png \
|
||||
res/drawable-xlarge-xhdpi-v11/tabs_carat_contracted_pb.png \
|
||||
res/drawable-xlarge-xhdpi-v11/tabs_carat_expanded.png \
|
||||
res/drawable-xlarge-xhdpi-v11/tabs_carat_expanded_pb.png \
|
||||
$(NULL)
|
||||
|
||||
RES_COLOR = \
|
||||
@ -1032,9 +1052,8 @@ MOZ_ANDROID_DRAWABLES += \
|
||||
mobile/android/base/resources/drawable/site_security_level.xml \
|
||||
mobile/android/base/resources/drawable/suggestion_selector.xml \
|
||||
mobile/android/base/resources/drawable/tab_new_button.xml \
|
||||
mobile/android/base/resources/drawable/tabs_button.xml \
|
||||
mobile/android/base/resources/drawable/tabs_level.xml \
|
||||
mobile/android/base/resources/drawable/tabs_tray_bg_repeat.xml \
|
||||
mobile/android/base/resources/drawable/tabs_tray_bg_pb_repeat.xml \
|
||||
mobile/android/base/resources/drawable/tabs_tray_selected_bg_repeat.xml \
|
||||
mobile/android/base/resources/drawable/tabs_tray_active_selector.xml \
|
||||
mobile/android/base/resources/drawable/tabs_tray_default_selector.xml \
|
||||
|
@ -10,9 +10,8 @@ import android.graphics.Canvas;
|
||||
import android.graphics.Path;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.util.AttributeSet;
|
||||
import android.widget.ImageButton;
|
||||
|
||||
public abstract class ShapedButton extends ImageButton
|
||||
public abstract class ShapedButton extends GeckoImageButton
|
||||
implements CanvasDelegate.DrawManager,
|
||||
LightweightTheme.OnChangeListener {
|
||||
protected GeckoActivity mActivity;
|
||||
|
@ -172,6 +172,8 @@ public class TabsButton extends ShapedButton {
|
||||
LayerDrawable layers = new LayerDrawable(new Drawable[] { resources.getDrawable(R.drawable.tabs_tray_bg_repeat), drawable });
|
||||
|
||||
StateListDrawable stateList = new StateListDrawable();
|
||||
stateList.addState(new int[] { R.attr.state_private, android.R.attr.state_pressed }, resources.getDrawable(R.drawable.highlight));
|
||||
stateList.addState(new int[] { R.attr.state_private }, resources.getDrawable(R.drawable.tabs_tray_bg_pb_repeat));
|
||||
stateList.addState(new int[] { android.R.attr.state_pressed }, resources.getDrawable(R.drawable.highlight));
|
||||
stateList.addState(new int[] {}, layers);
|
||||
|
||||
|
@ -0,0 +1,19 @@
|
||||
#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@">
|
||||
|
||||
<!-- selected state -->
|
||||
<item android:state_selected="true" android:color="#FFFF9500"/>
|
||||
|
||||
<!-- private browsing mode -->
|
||||
<item gecko:state_private="true" android:color="#FF666666"/>
|
||||
|
||||
<!-- normal mode -->
|
||||
<item android:color="#FFC7D1DB"/>
|
||||
|
||||
</selector>
|
BIN
mobile/android/base/resources/drawable-hdpi/tabs_carat_pb.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 1.5 KiB |
BIN
mobile/android/base/resources/drawable-nodpi/tabs_tray_bg_pb.png
Normal file
After Width: | Height: | Size: 3.9 KiB |
BIN
mobile/android/base/resources/drawable-xhdpi/tabs_carat_pb.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.4 KiB |
@ -1,22 +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/. -->
|
||||
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:maxLevel="1">
|
||||
<selector>
|
||||
<item android:state_pressed="true" android:drawable="@drawable/highlight"/>
|
||||
<item android:drawable="@drawable/tabs_tray_bg_repeat"/>
|
||||
</selector>
|
||||
</item>
|
||||
|
||||
<item android:maxLevel="2">
|
||||
<selector>
|
||||
<item android:state_pressed="true" android:drawable="@drawable/highlight"/>
|
||||
<item android:drawable="@drawable/tabs_tray_bg_repeat"/>
|
||||
</selector>
|
||||
</item>
|
||||
|
||||
</level-list>
|
@ -0,0 +1,50 @@
|
||||
#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/. -->
|
||||
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
|
||||
|
||||
<item android:maxLevel="1">
|
||||
|
||||
<selector>
|
||||
|
||||
<item gecko:state_private="true"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/highlight"/>
|
||||
|
||||
<item gecko:state_private="true"
|
||||
android:drawable="@drawable/tabs_tray_bg_pb_repeat"/>
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/highlight"/>
|
||||
|
||||
<item android:drawable="@drawable/tabs_tray_bg_repeat"/>
|
||||
|
||||
</selector>
|
||||
|
||||
</item>
|
||||
|
||||
<item android:maxLevel="2">
|
||||
|
||||
<selector>
|
||||
|
||||
<item gecko:state_private="true"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/highlight"/>
|
||||
|
||||
<item gecko:state_private="true"
|
||||
android:drawable="@drawable/tabs_tray_bg_pb_repeat"/>
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/highlight"/>
|
||||
|
||||
<item android:drawable="@drawable/tabs_tray_bg_repeat"/>
|
||||
|
||||
</selector>
|
||||
|
||||
</item>
|
||||
|
||||
</level-list>
|
After Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 1.2 KiB |
@ -1,14 +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/. -->
|
||||
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:maxLevel="0" android:drawable="@android:color/transparent"/>
|
||||
|
||||
<item android:maxLevel="1" android:drawable="@drawable/tabs_carat_contracted"/>
|
||||
|
||||
<item android:maxLevel="2" android:drawable="@drawable/tabs_carat_expanded"/>
|
||||
|
||||
</level-list>
|
@ -0,0 +1,26 @@
|
||||
#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/. -->
|
||||
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
|
||||
|
||||
<item android:maxLevel="0" android:drawable="@android:color/transparent"/>
|
||||
|
||||
<item android:maxLevel="1">
|
||||
<selector>
|
||||
<item gecko:state_private="true" android:drawable="@drawable/tabs_carat_contracted_pb"/>
|
||||
<item android:drawable="@drawable/tabs_carat_contracted"/>
|
||||
</selector>
|
||||
</item>
|
||||
|
||||
<item android:maxLevel="2">
|
||||
<selector>
|
||||
<item gecko:state_private="true" android:drawable="@drawable/tabs_carat_expanded_pb"/>
|
||||
<item android:drawable="@drawable/tabs_carat_expanded"/>
|
||||
</selector>
|
||||
</item>
|
||||
|
||||
</level-list>
|
After Width: | Height: | Size: 1.6 KiB |
After Width: | Height: | Size: 1.6 KiB |
32
mobile/android/base/resources/drawable/tabs_button.xml.in
Normal file
@ -0,0 +1,32 @@
|
||||
#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/. -->
|
||||
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
|
||||
|
||||
<item android:maxLevel="1">
|
||||
|
||||
<selector>
|
||||
|
||||
<item gecko:state_private="true"
|
||||
android:state_pressed="true"
|
||||
android:drawable="@drawable/highlight"/>
|
||||
|
||||
<item gecko:state_private="true"
|
||||
android:drawable="@drawable/tabs_tray_bg_pb_repeat"/>
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/highlight"/>
|
||||
|
||||
<item android:drawable="@drawable/tabs_tray_bg_repeat"/>
|
||||
|
||||
</selector>
|
||||
|
||||
</item>
|
||||
|
||||
<item android:maxLevel="2" android:drawable="@android:color/transparent"/>
|
||||
|
||||
</level-list>
|
BIN
mobile/android/base/resources/drawable/tabs_carat_pb.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
@ -1,17 +1,19 @@
|
||||
#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/. -->
|
||||
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:gecko="http://schemas.android.com/apk/res/@ANDROID_PACKAGE_NAME@">
|
||||
|
||||
<item android:maxLevel="0" android:drawable="@android:color/transparent"/>
|
||||
|
||||
<item android:maxLevel="1">
|
||||
<selector>
|
||||
<item android:state_pressed="true" android:drawable="@drawable/highlight"/>
|
||||
<item android:drawable="@drawable/tabs_tray_bg_repeat"/>
|
||||
<item gecko:state_private="true" android:drawable="@drawable/tabs_carat_pb"/>
|
||||
<item android:drawable="@drawable/tabs_carat"/>
|
||||
</selector>
|
||||
</item>
|
||||
|
||||
<item android:maxLevel="2" android:drawable="@android:color/transparent"/>
|
||||
|
||||
</level-list>
|
@ -3,10 +3,6 @@
|
||||
- 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/. -->
|
||||
|
||||
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:maxLevel="0" android:drawable="@android:color/transparent"/>
|
||||
|
||||
<item android:maxLevel="1" android:drawable="@drawable/tabs_carat"/>
|
||||
|
||||
</level-list>
|
||||
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:src="@drawable/tabs_tray_bg_pb"
|
||||
android:tileMode="repeat"/>
|
@ -48,13 +48,13 @@
|
||||
android:paddingLeft="30dip"
|
||||
android:paddingRight="10dip"/>
|
||||
|
||||
<TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="39dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4.5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
<Gecko.TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="39dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4.5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
|
||||
<FrameLayout style="@style/AddressBar.Button"
|
||||
android:layout_marginTop="3dp"
|
||||
|
@ -56,13 +56,13 @@
|
||||
android:paddingLeft="30dip"
|
||||
android:paddingRight="30dip"/>
|
||||
|
||||
<TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="80dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4.5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
<Gecko.TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="80dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4.5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
|
||||
<FrameLayout style="@style/AddressBar.Button"
|
||||
android:layout_marginTop="3dp"
|
||||
|
@ -44,13 +44,13 @@
|
||||
android:paddingLeft="42dip"
|
||||
android:paddingRight="42dip"/>
|
||||
|
||||
<TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="112dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
<Gecko.TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="112dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="6dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
|
||||
<LinearLayout android:id="@+id/menu_items"
|
||||
android:layout_width="wrap_content"
|
||||
|
@ -31,13 +31,13 @@
|
||||
android:paddingLeft="6dip"
|
||||
android:paddingRight="32dip"/>
|
||||
|
||||
<TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="52dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_alignLeft="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
<Gecko.TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="52dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_alignLeft="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
|
||||
<ImageButton android:id="@+id/menu"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
|
@ -48,13 +48,13 @@
|
||||
android:paddingLeft="38dip"
|
||||
android:paddingRight="10dip"/>
|
||||
|
||||
<TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="44.5dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
<Gecko.TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="44.5dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
|
||||
<FrameLayout style="@style/AddressBar.Button"
|
||||
android:layout_marginTop="4dp"
|
||||
|
@ -57,13 +57,13 @@
|
||||
android:paddingLeft="38dip"
|
||||
android:paddingRight="36dip"/>
|
||||
|
||||
<TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="98dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
<Gecko.TextSwitcher android:id="@+id/tabs_count"
|
||||
style="@style/AddressBar.ImageButton"
|
||||
android:layout_width="98dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_alignRight="@id/tabs"
|
||||
android:gravity="center_horizontal"/>
|
||||
|
||||
<FrameLayout style="@style/AddressBar.Button"
|
||||
android:layout_marginTop="4dp"
|
||||
|
@ -3,13 +3,14 @@
|
||||
- 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/. -->
|
||||
|
||||
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="@dimen/tabs_counter_size"
|
||||
android:textColor="@color/tabs_counter_color"
|
||||
android:gravity="center"
|
||||
android:shadowColor="#7F000000"
|
||||
android:shadowRadius="1"
|
||||
android:shadowDx="0"
|
||||
android:shadowDy="1"/>
|
||||
<Gecko.TextView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="@dimen/tabs_counter_size"
|
||||
android:textColor="@color/tabs_counter_color"
|
||||
android:duplicateParentState="true"
|
||||
android:gravity="center"
|
||||
android:shadowColor="#7F000000"
|
||||
android:shadowRadius="1"
|
||||
android:shadowDx="0"
|
||||
android:shadowDy="1"/>
|
||||
|
@ -12,7 +12,6 @@
|
||||
<color name="validation_message_text">#ffffff</color>
|
||||
<color name="identity_verified">#77BAFF</color>
|
||||
<color name="identity_identified">#B7D46A</color>
|
||||
<color name="tabs_counter_color">#C7D1DB</color>
|
||||
<color name="url_bar_text_highlight">#FF9500</color>
|
||||
<color name="suggestion_primary">#dddddd</color>
|
||||
<color name="suggestion_pressed">#bbbbbb</color>
|
||||
|