Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/base/resources/layout/tabs_panel_default.xml

Issue 29348083: Issue 3769 - UI colours gone bad (Closed)
Patch Set: Adjusting comments which indicates what has being changed by this issue in upstream code Created Oct. 25, 2016, 12:16 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- This Source Code Form is subject to the terms of the Mozilla Public 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public
3 - License, v. 2.0. If a copy of the MPL was not distributed with this 3 - License, v. 2.0. If a copy of the MPL was not distributed with this
4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
5 5
6 <merge xmlns:android="http://schemas.android.com/apk/res/android" 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"
7 xmlns:gecko="http://schemas.android.com/apk/res-auto"> 7 xmlns:gecko="http://schemas.android.com/apk/res-auto">
8 8
9 <!-- The layout_height value is used in TabsPanel.getTabsLayoutContainerHeig ht 9 <!-- The layout_height value is used in TabsPanel.getTabsLayoutContainerHeig ht
10 and as an offset in PrivateTabsPanel: if you change it here, 10 and as an offset in PrivateTabsPanel: if you change it here,
11 change it there! --> 11 change it there! -->
12 <RelativeLayout android:id="@+id/tabs_panel_header" 12 <RelativeLayout android:id="@+id/tabs_panel_header"
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 android:layout_height="@dimen/browser_toolbar_height"> 14 android:layout_height="@dimen/browser_toolbar_height">
15 15
16 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/ 3769 -->
16 <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar" 17 <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar"
17 android:layout_width="match_parent" 18 android:layout_width="match_parent"
18 android:layout_height="@dimen/browser_toolbar_height" 19 android:layout_height="@dimen/browser_toolbar_height"
19 android:background="@color/text_and_tabs_tray_grey"> 20 android:background="@color/abb_background_light_grey">
20 21
21 <org.mozilla.gecko.tabs.TabPanelBackButton 22 <org.mozilla.gecko.tabs.TabPanelBackButton
22 android:id="@+id/nav_back" 23 android:id="@+id/nav_back"
23 android:layout_width="@dimen/tabs_panel_button_width" 24 android:layout_width="@dimen/tabs_panel_button_width"
24 android:layout_height="match_parent" 25 android:layout_height="match_parent"
25 android:minWidth="@dimen/tabs_panel_button_width" 26 android:minWidth="@dimen/tabs_panel_button_width"
26 android:src="@drawable/tabs_panel_nav_back" 27 android:src="@drawable/tabs_panel_nav_back"
27 android:contentDescription="@string/back" 28 android:contentDescription="@string/back"
28 android:background="@drawable/action_bar_button_inverse" 29 android:background="@drawable/action_bar_button_inverse"
29 gecko:dividerVerticalPadding="@dimen/tab_panel_divider_vertical_ padding" 30 gecko:dividerVerticalPadding="@dimen/tab_panel_divider_vertical_ padding"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 93
93 <org.mozilla.gecko.tabs.PrivateTabsPanel 94 <org.mozilla.gecko.tabs.PrivateTabsPanel
94 android:id="@+id/private_tabs_panel" 95 android:id="@+id/private_tabs_panel"
95 android:layout_width="match_parent" 96 android:layout_width="match_parent"
96 android:layout_height="match_parent" 97 android:layout_height="match_parent"
97 android:visibility="gone"/> 98 android:visibility="gone"/>
98 99
99 </FrameLayout> 100 </FrameLayout>
100 101
101 </merge> 102 </merge>
OLDNEW
« no previous file with comments | « mobile/android/base/resources/layout/tabs_counter.xml ('k') | mobile/android/base/resources/layout/tabs_panel_view.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld