Side by Side Diff: mobile/android/base/resources/menu/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.
« no previous file with comments
|
« mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml ('k')
|
mobile/android/base/resources/values/colors.xml » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 <menu xmlns:android="http://schemas.android.com/apk/res/android"> | 6 <menu xmlns:android="http://schemas.android.com/apk/res/android"> |
| 7 | 7 |
| 8 <item android:id="@+id/reload" | 8 <item android:id="@+id/reload" |
| 9 android:icon="@drawable/ic_menu_reload" | 9 android:icon="@drawable/ic_menu_reload" |
| 10 android:title="@string/reload"/> | 10 android:title="@string/reload"/> |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 | 35 |
| 36 <item android:id="@+id/reading_list" | 36 <item android:id="@+id/reading_list" |
| 37 android:title="@string/overlay_share_reading_list_btn_label" /> | 37 android:title="@string/overlay_share_reading_list_btn_label" /> |
| 38 | 38 |
| 39 <item android:id="@+id/save_as_pdf" | 39 <item android:id="@+id/save_as_pdf" |
| 40 android:title="@string/save_as_pdf" /> | 40 android:title="@string/save_as_pdf" /> |
| 41 | 41 |
| 42 <item android:id="@+id/find_in_page" | 42 <item android:id="@+id/find_in_page" |
| 43 android:title="@string/find_in_page" /> | 43 android:title="@string/find_in_page" /> |
| 44 | 44 |
| 45 <item android:id="@+id/abb_block_ads" | |
| 46 android:title="@string/abb_block_ads" | |
| 47 android:enabled="false" | |
| 48 android:checkable="true" /> | |
| 49 | |
| 45 <item android:id="@+id/desktop_mode" | 50 <item android:id="@+id/desktop_mode" |
| 46 android:title="@string/desktop_mode" | 51 android:title="@string/desktop_mode" |
| 47 android:checkable="true" /> | 52 android:checkable="true" /> |
| 48 | 53 |
| 49 <item android:id="@+id/addons" | 54 <item android:id="@+id/addons" |
| 55 android:visible="false" | |
| 50 android:title="@string/addons"/> | 56 android:title="@string/addons"/> |
| 51 | 57 |
| 52 <item android:id="@+id/downloads" | 58 <item android:id="@+id/downloads" |
| 53 android:title="@string/downloads"/> | 59 android:title="@string/downloads"/> |
| 54 | 60 |
| 55 <item android:id="@+id/logins" | 61 <item android:id="@+id/logins" |
| 56 android:title="@string/logins"/> | 62 android:title="@string/logins"/> |
| 57 | 63 |
| 58 <item android:id="@+id/char_encoding" | 64 <item android:id="@+id/char_encoding" |
| 59 android:visible="false" | 65 android:visible="false" |
| 60 android:title="@string/char_encoding"/> | 66 android:title="@string/char_encoding"/> |
| 61 | 67 |
| 62 <item android:id="@+id/settings" | 68 <item android:id="@+id/settings" |
| 63 android:title="@string/settings" /> | 69 android:title="@string/settings" /> |
| 64 | 70 |
| 65 <item android:id="@+id/help" | 71 <item android:id="@+id/help" |
| 72 android:visible="false" | |
| 66 android:title="@string/help_menu" /> | 73 android:title="@string/help_menu" /> |
| 67 | 74 |
| 68 <item android:id="@+id/new_guest_session" | 75 <item android:id="@+id/new_guest_session" |
| 69 android:icon="@drawable/ic_menu_guest" | 76 android:icon="@drawable/ic_menu_guest" |
| 70 android:visible="false" | 77 android:visible="false" |
| 71 android:title="@string/new_guest_session"/> | 78 android:title="@string/new_guest_session"/> |
| 72 | 79 |
| 73 <item android:id="@+id/exit_guest_session" | 80 <item android:id="@+id/exit_guest_session" |
| 74 android:icon="@drawable/ic_menu_guest" | 81 android:icon="@drawable/ic_menu_guest" |
| 75 android:visible="false" | 82 android:visible="false" |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 88 <item android:id="@+id/page" | 95 <item android:id="@+id/page" |
| 89 android:visible="false" | 96 android:visible="false" |
| 90 android:enabled="false" | 97 android:enabled="false" |
| 91 android:title="@string/page" /> | 98 android:title="@string/page" /> |
| 92 | 99 |
| 93 <item android:id="@+id/tools" | 100 <item android:id="@+id/tools" |
| 94 android:visible="false" | 101 android:visible="false" |
| 95 android:enabled="false" | 102 android:enabled="false" |
| 96 android:title="@string/tools" /> | 103 android:title="@string/tools" /> |
| 97 </menu> | 104 </menu> |
| OLD | NEW |
« no previous file with comments
|
« mobile/android/base/resources/menu-xlarge-v11/browser_app_menu.xml ('k')
|
mobile/android/base/resources/values/colors.xml » ('j')
|
no next file with comments »
