| OLD | NEW |
| 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 xmlns:tools="http://schemas.android.com/tools" | 8 xmlns:tools="http://schemas.android.com/tools" |
| 9 tools:parentTag="LinearLayout" | 9 tools:parentTag="LinearLayout" |
| 10 tools:layout_width="match_parent" | 10 tools:layout_width="match_parent" |
| 11 tools:layout_height="match_parent" | 11 tools:layout_height="match_parent" |
| 12 tools:background="@color/text_and_tabs_tray_grey" | 12 tools:background="@color/text_and_tabs_tray_grey" |
| 13 tools:orientation="vertical"> | 13 tools:orientation="vertical"> |
| 14 | 14 |
| 15 <!-- The layout_height value is used in TabsPanel.getTabsLayoutContainerHeig
ht | 15 <!-- The layout_height value is used in TabsPanel.getTabsLayoutContainerHeig
ht |
| 16 and as an offset in PrivateTabsPanel: if you change it here, | 16 and as an offset in PrivateTabsPanel: if you change it here, |
| 17 change it there! --> | 17 change it there! --> |
| 18 <RelativeLayout android:id="@+id/tabs_panel_header" | 18 <RelativeLayout android:id="@+id/tabs_panel_header" |
| 19 android:layout_width="match_parent" | 19 android:layout_width="match_parent" |
| 20 android:layout_height="@dimen/browser_toolbar_height"> | 20 android:layout_height="@dimen/browser_toolbar_height"> |
| 21 | 21 |
| 22 <!-- Using ABB color palette. See https://issues.adblockplus.org/ticket/
3769 --> | |
| 23 <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar" | 22 <view class="org.mozilla.gecko.tabs.TabsPanel$TabsPanelToolbar" |
| 24 android:layout_width="match_parent" | 23 android:layout_width="match_parent" |
| 25 android:layout_height="@dimen/browser_toolbar_height" | 24 android:layout_height="@dimen/browser_toolbar_height" |
| 26 android:background="@color/abb_background_light_grey"> | 25 android:background="@color/text_and_tabs_tray_grey"> |
| 27 | 26 |
| 28 <org.mozilla.gecko.tabs.TabPanelBackButton | 27 <org.mozilla.gecko.tabs.TabPanelBackButton |
| 29 android:id="@+id/nav_back" | 28 android:id="@+id/nav_back" |
| 30 android:layout_width="@dimen/tabs_panel_button_width" | 29 android:layout_width="@dimen/tabs_panel_button_width" |
| 31 android:layout_height="match_parent" | 30 android:layout_height="match_parent" |
| 32 android:minWidth="@dimen/tabs_panel_button_width" | 31 android:minWidth="@dimen/tabs_panel_button_width" |
| 33 android:src="@drawable/tabs_panel_nav_back" | 32 android:src="@drawable/tabs_panel_nav_back" |
| 34 android:contentDescription="@string/back" | 33 android:contentDescription="@string/back" |
| 35 android:background="@drawable/action_bar_button_inverse"/> | 34 android:background="@drawable/action_bar_button_inverse"/> |
| 36 | 35 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 82 |
| 84 <org.mozilla.gecko.tabs.PrivateTabsPanel | 83 <org.mozilla.gecko.tabs.PrivateTabsPanel |
| 85 android:id="@+id/private_tabs_panel" | 84 android:id="@+id/private_tabs_panel" |
| 86 android:layout_width="match_parent" | 85 android:layout_width="match_parent" |
| 87 android:layout_height="match_parent" | 86 android:layout_height="match_parent" |
| 88 android:visibility="gone"/> | 87 android:visibility="gone"/> |
| 89 | 88 |
| 90 </FrameLayout> | 89 </FrameLayout> |
| 91 | 90 |
| 92 </merge> | 91 </merge> |
| OLD | NEW |