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 | <org.mozilla.gecko.toolbar.ShapedButton android:id="@+id/tabs" |
michael@0 | 10 | style="@style/UrlBar.ImageButton" |
michael@0 | 11 | android:layout_width="84dip" |
michael@0 | 12 | android:layout_alignParentLeft="true" |
michael@0 | 13 | gecko:curveTowards="left" |
michael@0 | 14 | android:background="@drawable/shaped_button" |
michael@0 | 15 | android:gravity="center_vertical" |
michael@0 | 16 | android:paddingLeft="6dip" |
michael@0 | 17 | android:paddingRight="38dip"/> |
michael@0 | 18 | |
michael@0 | 19 | <!-- The TextSwitcher should be shifted 28dp on the right, to avoid |
michael@0 | 20 | the curve. On a 56dp space, centering 24dp image will leave |
michael@0 | 21 | 16dp on all sides. However this image has a perception of |
michael@0 | 22 | 2 layers. Hence to center this, an additional 4dp is added to the right. |
michael@0 | 23 | The margins will be 12dp on left, 48dp on right, instead of ideal 16dp |
michael@0 | 24 | and 44dp. --> |
michael@0 | 25 | <org.mozilla.gecko.toolbar.TabCounter android:id="@+id/tabs_counter" |
michael@0 | 26 | style="@style/UrlBar.ImageButton.TabCount" |
michael@0 | 27 | android:layout_width="24dip" |
michael@0 | 28 | android:layout_height="24dip" |
michael@0 | 29 | android:layout_marginLeft="12dip" |
michael@0 | 30 | android:layout_marginRight="48dip" |
michael@0 | 31 | android:layout_marginTop="16dp" |
michael@0 | 32 | android:layout_alignLeft="@id/tabs"/> |
michael@0 | 33 | |
michael@0 | 34 | <ImageView android:id="@+id/url_bar_entry" |
michael@0 | 35 | android:layout_width="fill_parent" |
michael@0 | 36 | android:layout_height="fill_parent" |
michael@0 | 37 | android:layout_toRightOf="@id/tabs" |
michael@0 | 38 | android:layout_toLeftOf="@id/menu_items" |
michael@0 | 39 | android:layout_marginLeft="-18dp" |
michael@0 | 40 | android:layout_marginTop="7dp" |
michael@0 | 41 | android:layout_marginBottom="7dp" |
michael@0 | 42 | android:duplicateParentState="true" |
michael@0 | 43 | android:clickable="false" |
michael@0 | 44 | android:focusable="false" |
michael@0 | 45 | android:background="@drawable/url_bar_entry"/> |
michael@0 | 46 | |
michael@0 | 47 | <org.mozilla.gecko.toolbar.ForwardButton style="@style/UrlBar.ImageButton.Forward" |
michael@0 | 48 | android:id="@+id/forward" |
michael@0 | 49 | android:layout_toRightOf="@+id/tabs"/> |
michael@0 | 50 | |
michael@0 | 51 | <org.mozilla.gecko.toolbar.BackButton android:id="@+id/back" |
michael@0 | 52 | style="@style/UrlBar.ImageButton" |
michael@0 | 53 | android:layout_width="50dip" |
michael@0 | 54 | android:layout_height="50dip" |
michael@0 | 55 | android:layout_toRightOf="@id/tabs" |
michael@0 | 56 | android:layout_marginLeft="-28dp" |
michael@0 | 57 | android:layout_centerVertical="true" |
michael@0 | 58 | android:padding="13dp" |
michael@0 | 59 | android:src="@drawable/ic_menu_back" |
michael@0 | 60 | android:contentDescription="@string/back" |
michael@0 | 61 | android:background="@drawable/url_bar_nav_button"/> |
michael@0 | 62 | |
michael@0 | 63 | <org.mozilla.gecko.toolbar.ToolbarEditLayout android:id="@+id/edit_layout" |
michael@0 | 64 | style="@style/UrlBar.Button" |
michael@0 | 65 | android:paddingLeft="12dp" |
michael@0 | 66 | android:paddingRight="4dp" |
michael@0 | 67 | android:visibility="gone" |
michael@0 | 68 | android:orientation="horizontal" |
michael@0 | 69 | android:layout_toRightOf="@id/back" |
michael@0 | 70 | android:layout_toLeftOf="@id/menu_items"/> |
michael@0 | 71 | |
michael@0 | 72 | <org.mozilla.gecko.toolbar.ToolbarDisplayLayout android:id="@+id/display_layout" |
michael@0 | 73 | style="@style/UrlBar.Button.Container" |
michael@0 | 74 | android:layout_toRightOf="@id/back" |
michael@0 | 75 | android:layout_toLeftOf="@id/menu_items"/> |
michael@0 | 76 | |
michael@0 | 77 | <LinearLayout android:id="@+id/menu_items" |
michael@0 | 78 | android:layout_width="wrap_content" |
michael@0 | 79 | android:layout_height="fill_parent" |
michael@0 | 80 | android:layout_marginLeft="3dp" |
michael@0 | 81 | android:orientation="horizontal" |
michael@0 | 82 | android:layout_toLeftOf="@id/menu" |
michael@0 | 83 | android:layout_alignWithParentIfMissing="true"/> |
michael@0 | 84 | |
michael@0 | 85 | <org.mozilla.gecko.widget.ThemedImageButton android:id="@+id/menu" |
michael@0 | 86 | style="@style/UrlBar.ImageButton" |
michael@0 | 87 | android:layout_width="56dip" |
michael@0 | 88 | android:layout_alignParentRight="true" |
michael@0 | 89 | android:contentDescription="@string/menu" |
michael@0 | 90 | android:background="@drawable/action_bar_button" |
michael@0 | 91 | android:visibility="gone"/> |
michael@0 | 92 | |
michael@0 | 93 | <org.mozilla.gecko.widget.ThemedImageView android:id="@+id/menu_icon" |
michael@0 | 94 | style="@style/UrlBar.ImageButton" |
michael@0 | 95 | android:layout_alignLeft="@id/menu" |
michael@0 | 96 | android:layout_alignRight="@id/menu" |
michael@0 | 97 | android:gravity="center_vertical" |
michael@0 | 98 | android:src="@drawable/menu_level" |
michael@0 | 99 | android:visibility="gone"/> |
michael@0 | 100 | |
michael@0 | 101 | <ImageView android:id="@+id/shadow" |
michael@0 | 102 | android:layout_width="fill_parent" |
michael@0 | 103 | android:layout_height="2dp" |
michael@0 | 104 | android:layout_alignParentBottom="true" |
michael@0 | 105 | android:background="@color/url_bar_shadow" |
michael@0 | 106 | android:contentDescription="@null"/> |
michael@0 | 107 | |
michael@0 | 108 | </merge> |