Wed, 31 Dec 2014 07:22:50 +0100
Correct previous dual key logic pending first delivery installment.
michael@0 | 1 | <?xml version="1.0" encoding="utf-8"?> |
michael@0 | 2 | <!-- This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | - License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
michael@0 | 5 | |
michael@0 | 6 | <merge xmlns:android="http://schemas.android.com/apk/res/android" |
michael@0 | 7 | xmlns:gecko="http://schemas.android.com/apk/res-auto"> |
michael@0 | 8 | |
michael@0 | 9 | <RelativeLayout android:id="@+id/tabs_panel_header" |
michael@0 | 10 | android:layout_width="fill_parent" |
michael@0 | 11 | android:layout_height="@dimen/browser_toolbar_height"> |
michael@0 | 12 | |
michael@0 | 13 | <view class="org.mozilla.gecko.TabsPanel$TabsPanelToolbar" |
michael@0 | 14 | android:layout_width="fill_parent" |
michael@0 | 15 | android:layout_height="fill_parent" |
michael@0 | 16 | android:background="@color/background_tabs"> |
michael@0 | 17 | |
michael@0 | 18 | <include layout="@layout/tabs_panel_header"/> |
michael@0 | 19 | |
michael@0 | 20 | </view> |
michael@0 | 21 | |
michael@0 | 22 | <View android:layout_width="fill_parent" |
michael@0 | 23 | android:layout_height="2dp" |
michael@0 | 24 | android:layout_alignParentBottom="true" |
michael@0 | 25 | android:background="#1A000000"/> |
michael@0 | 26 | |
michael@0 | 27 | </RelativeLayout> |
michael@0 | 28 | |
michael@0 | 29 | <view class="org.mozilla.gecko.TabsPanel$TabsListContainer" |
michael@0 | 30 | android:id="@+id/tabs_container" |
michael@0 | 31 | android:layout_width="fill_parent" |
michael@0 | 32 | android:layout_height="wrap_content"> |
michael@0 | 33 | |
michael@0 | 34 | <org.mozilla.gecko.TabsTray android:id="@+id/normal_tabs" |
michael@0 | 35 | style="@style/TabsList" |
michael@0 | 36 | android:layout_width="fill_parent" |
michael@0 | 37 | android:layout_height="fill_parent" |
michael@0 | 38 | android:choiceMode="singleChoice" |
michael@0 | 39 | android:visibility="gone" |
michael@0 | 40 | gecko:tabs="tabs_normal"/> |
michael@0 | 41 | |
michael@0 | 42 | <org.mozilla.gecko.TabsTray android:id="@+id/private_tabs" |
michael@0 | 43 | style="@style/TabsList" |
michael@0 | 44 | android:layout_width="fill_parent" |
michael@0 | 45 | android:layout_height="fill_parent" |
michael@0 | 46 | android:choiceMode="singleChoice" |
michael@0 | 47 | android:visibility="gone" |
michael@0 | 48 | gecko:tabs="tabs_private"/> |
michael@0 | 49 | |
michael@0 | 50 | <org.mozilla.gecko.RemoteTabsContainer android:id="@+id/synced_tabs" |
michael@0 | 51 | android:layout_width="fill_parent" |
michael@0 | 52 | android:layout_height="fill_parent" |
michael@0 | 53 | android:visibility="gone"> |
michael@0 | 54 | |
michael@0 | 55 | <org.mozilla.gecko.RemoteTabsList android:id="@+id/synced_tabs_list" |
michael@0 | 56 | style="@style/RemoteTabsList" |
michael@0 | 57 | android:layout_width="fill_parent" |
michael@0 | 58 | android:layout_height="fill_parent" |
michael@0 | 59 | android:paddingLeft="@dimen/tabs_panel_list_padding" |
michael@0 | 60 | android:paddingRight="@dimen/tabs_panel_list_padding" |
michael@0 | 61 | android:scrollbarStyle="outsideOverlay"/> |
michael@0 | 62 | |
michael@0 | 63 | </org.mozilla.gecko.RemoteTabsContainer> |
michael@0 | 64 | |
michael@0 | 65 | </view> |
michael@0 | 66 | |
michael@0 | 67 | </merge> |