зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1134484 - Replace uses of @color/toolbar_grey. r=liuche
--HG-- extra : rebase_source : e7f563364d929e03957fc6da854d2f8d3ed72981
This commit is contained in:
Родитель
e638548751
Коммит
2e3d0f77c2
|
@ -11,7 +11,7 @@
|
|||
<LinearLayout android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/background_normal">
|
||||
android:background="@color/toolbar_grey">
|
||||
|
||||
<LinearLayout android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
|
|
|
@ -145,7 +145,7 @@ public class LayerRenderer implements Tabs.OnTabsChangedListener {
|
|||
|
||||
public LayerRenderer(LayerView view) {
|
||||
mView = view;
|
||||
setOverscrollColor(R.color.background_normal);
|
||||
setOverscrollColor(R.color.toolbar_grey);
|
||||
|
||||
Bitmap scrollbarImage = view.getScrollbarImage();
|
||||
IntSize size = new IntSize(scrollbarImage.getWidth(), scrollbarImage.getHeight());
|
||||
|
@ -682,7 +682,7 @@ public class LayerRenderer implements Tabs.OnTabsChangedListener {
|
|||
if (msg == Tabs.TabEvents.SELECTED) {
|
||||
if (mView != null) {
|
||||
final int overscrollColor =
|
||||
(tab.isPrivate() ? R.color.private_toolbar_grey : R.color.background_normal);
|
||||
(tab.isPrivate() ? R.color.private_toolbar_grey : R.color.toolbar_grey);
|
||||
setOverscrollColor(overscrollColor);
|
||||
|
||||
if (mView.getChildAt(0) != null) {
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
android:color="@color/new_tablet_highlight_dark_lwt" />
|
||||
|
||||
<item android:state_checked="true"
|
||||
android:color="@color/background_normal" />
|
||||
android:color="@color/toolbar_grey" />
|
||||
|
||||
<item android:state_pressed="true"
|
||||
android:color="@color/tabs_tray_grey_pressed" />
|
||||
|
|
|
@ -31,6 +31,6 @@
|
|||
android:drawable="@color/private_toolbar_grey"/>
|
||||
|
||||
<!-- normal mode -->
|
||||
<item android:drawable="@color/background_normal"/>
|
||||
<item android:drawable="@color/toolbar_grey"/>
|
||||
|
||||
</selector>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/background_normal"/>
|
||||
<solid android:color="@color/toolbar_grey"/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
|
|
|
@ -10,6 +10,6 @@
|
|||
<item gecko:state_private="true" android:drawable="@color/private_toolbar_grey"/>
|
||||
|
||||
<!-- normal mode -->
|
||||
<item android:drawable="@color/background_normal"/>
|
||||
<item android:drawable="@color/toolbar_grey"/>
|
||||
|
||||
</selector>
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
android:topRightRadius="0dp"
|
||||
android:bottomLeftRadius="0dp"
|
||||
android:bottomRightRadius="0dp"/>
|
||||
<solid android:color="@color/widget_logo_default"/>
|
||||
<solid android:color="@color/toolbar_grey"/>
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<LinearLayout android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/browser_toolbar_height"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/background_normal"
|
||||
android:background="@color/toolbar_grey"
|
||||
android:padding="4dip">
|
||||
|
||||
<EditText android:id="@+id/search"
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/global_background_color">
|
||||
android:background="@color/toolbar_grey">
|
||||
|
||||
<ViewStub android:id="@+id/empty_view_stub"
|
||||
android:layout="@layout/search_empty"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/global_background_color"
|
||||
android:background="@color/toolbar_grey"
|
||||
android:paddingLeft="@dimen/search_row_padding"
|
||||
android:paddingRight="@dimen/search_row_padding"
|
||||
android:visibility="invisible"/>
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
|
||||
<item name="android:windowBackground">@color/global_background_color</item>
|
||||
<item name="android:colorBackground">@color/global_background_color</item>
|
||||
<item name="android:windowBackground">@color/toolbar_grey</item>
|
||||
<item name="android:colorBackground">@color/toolbar_grey</item>
|
||||
|
||||
<!--This attribute is required so that we can create a facet button-->
|
||||
<!--pragmatically. The defStyle param used in the View constructor-->
|
||||
|
|
|
@ -28,8 +28,7 @@
|
|||
<!-- Non-palette colors -->
|
||||
<color name="background_light">#FFF5F5F5</color>
|
||||
|
||||
<!-- If you update one, update the other. -->
|
||||
<color name="background_normal">#FFEBEBF0</color>
|
||||
<!-- Synced w/ toolbar_grey -->
|
||||
<color name="background_normal_lwt">#DDEBEBF0</color>
|
||||
|
||||
<color name="highlight">#33000000</color>
|
||||
|
|
|
@ -4,13 +4,10 @@
|
|||
|
||||
<resources>
|
||||
|
||||
<color name="global_background_color">#EBEBF0</color>
|
||||
|
||||
<!-- card colors -->
|
||||
<color name="row_background">#ffffff</color>
|
||||
<color name="row_background_pressed">#DCDCE1</color>
|
||||
|
||||
<color name="widget_logo_default">#EBEBF0</color>
|
||||
<color name="widget_button_pressed">#33000000</color>
|
||||
|
||||
<!--Facet button colors-->
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="@android:style/Theme.Light.NoTitleBar">
|
||||
<item name="android:windowBackground">@color/global_background_color</item>
|
||||
<item name="android:colorBackground">@color/global_background_color</item>
|
||||
<item name="android:windowBackground">@color/toolbar_grey</item>
|
||||
<item name="android:colorBackground">@color/toolbar_grey</item>
|
||||
|
||||
<!--This attribute is required so that we can create a facet button-->
|
||||
<!--pragmatically. The defStyle param used in the View constructor-->
|
||||
|
|
|
@ -207,6 +207,6 @@ class BrowserToolbarTablet extends BrowserToolbarTabletBase {
|
|||
@Override
|
||||
protected Drawable getLWTDefaultStateSetDrawable() {
|
||||
return BrowserToolbar.getLightweightThemeDrawable(this, getResources(), getTheme(),
|
||||
R.color.background_normal);
|
||||
R.color.toolbar_grey);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -61,7 +61,7 @@ abstract class NavButton extends ShapedButton {
|
|||
@Override
|
||||
public void onLightweightThemeChanged() {
|
||||
final Drawable drawable = BrowserToolbar.getLightweightThemeDrawable(this, getResources(),
|
||||
getTheme(), R.color.background_normal);
|
||||
getTheme(), R.color.toolbar_grey);
|
||||
|
||||
if (drawable == null) {
|
||||
return;
|
||||
|
|
Загрузка…
Ссылка в новой задаче