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

Side by Side Diff: mobile/android/base/resources/menu-v11/browser_app_menu.xml

Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1 (Closed)
Patch Set: Created Nov. 26, 2015, 11:01 a.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 <!-- We disable AlwaysShowAction because we interpret the menu 6 <!-- We disable AlwaysShowAction because we interpret the menu
7 attributes ourselves and thus the warning isn't relevant to us. --> 7 attributes ourselves and thus the warning isn't relevant to us. -->
8 <menu xmlns:android="http://schemas.android.com/apk/res/android" 8 <menu xmlns:android="http://schemas.android.com/apk/res/android"
9 xmlns:tools="http://schemas.android.com/tools" 9 xmlns:tools="http://schemas.android.com/tools"
10 tools:ignore="AlwaysShowAction"> 10 tools:ignore="AlwaysShowAction">
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 android:title="@string/new_tab"/> 53 android:title="@string/new_tab"/>
54 54
55 <item android:id="@+id/new_private_tab" 55 <item android:id="@+id/new_private_tab"
56 android:icon="@drawable/ic_menu_new_private_tab" 56 android:icon="@drawable/ic_menu_new_private_tab"
57 android:title="@string/new_private_tab"/> 57 android:title="@string/new_private_tab"/>
58 58
59 <item android:id="@+id/find_in_page" 59 <item android:id="@+id/find_in_page"
60 android:icon="@drawable/ic_menu_find_in_page" 60 android:icon="@drawable/ic_menu_find_in_page"
61 android:title="@string/find_in_page" /> 61 android:title="@string/find_in_page" />
62 62
63 <item android:id="@+id/abb_block_ads"
64 android:title="@string/abb_block_ads"
65 android:enabled="false"
66 android:checkable="true" />
67
63 <item android:id="@+id/desktop_mode" 68 <item android:id="@+id/desktop_mode"
64 android:icon="@drawable/ic_menu_desktop_mode_off" 69 android:icon="@drawable/ic_menu_desktop_mode_off"
65 android:title="@string/desktop_mode" 70 android:title="@string/desktop_mode"
66 android:checkable="true" /> 71 android:checkable="true" />
67 72
68 <item android:id="@+id/page" 73 <item android:id="@+id/page"
69 android:title="@string/page" 74 android:title="@string/page"
70 android:icon="@drawable/ic_menu_tools"> 75 android:icon="@drawable/ic_menu_tools">
71 76
72 <menu> 77 <menu>
(...skipping 22 matching lines...) Expand all
95 android:icon="@drawable/ic_menu_tools"> 100 android:icon="@drawable/ic_menu_tools">
96 101
97 <menu> 102 <menu>
98 103
99 <item android:id="@+id/downloads" 104 <item android:id="@+id/downloads"
100 android:icon="@drawable/ic_menu_downloads" 105 android:icon="@drawable/ic_menu_downloads"
101 android:title="@string/downloads"/> 106 android:title="@string/downloads"/>
102 107
103 <item android:id="@+id/addons" 108 <item android:id="@+id/addons"
104 android:icon="@drawable/ic_menu_addons" 109 android:icon="@drawable/ic_menu_addons"
110 android:visible="false"
105 android:title="@string/addons"/> 111 android:title="@string/addons"/>
106 112
107 <item android:id="@+id/logins" 113 <item android:id="@+id/logins"
108 android:title="@string/logins"/> 114 android:title="@string/logins"/>
109 115
110 <item android:id="@+id/new_guest_session" 116 <item android:id="@+id/new_guest_session"
111 android:icon="@drawable/ic_menu_guest" 117 android:icon="@drawable/ic_menu_guest"
112 android:visible="false" 118 android:visible="false"
113 android:title="@string/new_guest_session"/> 119 android:title="@string/new_guest_session"/>
114 120
115 <item android:id="@+id/exit_guest_session" 121 <item android:id="@+id/exit_guest_session"
116 android:icon="@drawable/ic_menu_guest" 122 android:icon="@drawable/ic_menu_guest"
117 android:visible="false" 123 android:visible="false"
118 android:title="@string/exit_guest_session"/> 124 android:title="@string/exit_guest_session"/>
119 125
120 </menu> 126 </menu>
121 127
122 </item> 128 </item>
123 129
124 <item android:id="@+id/char_encoding" 130 <item android:id="@+id/char_encoding"
125 android:icon="@drawable/ic_menu_character_encoding" 131 android:icon="@drawable/ic_menu_character_encoding"
126 android:visible="false" 132 android:visible="false"
127 android:title="@string/char_encoding"/> 133 android:title="@string/char_encoding"/>
128 134
129 <item android:id="@+id/settings" 135 <item android:id="@+id/settings"
130 android:icon="@drawable/ic_menu_settings" 136 android:icon="@drawable/ic_menu_settings"
131 android:title="@string/settings" /> 137 android:title="@string/settings" />
132 138
133 <item android:id="@+id/help" 139 <item android:id="@+id/help"
140 android:visible="false"
134 android:title="@string/help_menu" /> 141 android:title="@string/help_menu" />
135 142
136 </menu> 143 </menu>
OLDNEW

Powered by Google App Engine
This is Rietveld