| OLD | NEW |
|---|
| (Empty) | |
| 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> |
| 5 |
| 6 <!-- The location bar also know as URL bar --> |
| 7 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 8 <FrameLayout android:id="@+id/location_bar_icon" |
| 9 android:layout_width="@dimen/location_bar_icon_width" |
| 10 android:layout_height="match_parent" |
| 11 android:layout_gravity="start|center_vertical"> |
| 12 <ImageView android:id="@+id/navigation_button" |
| 13 style="@style/LocationBarButton" |
| 14 android:layout_width="match_parent" |
| 15 android:layout_height="match_parent" |
| 16 android:layout_gravity="center_vertical" |
| 17 android:src="@drawable/ic_omnibox_page" |
| 18 android:scaleType="center" |
| 19 android:contentDescription="@null"/> |
| 20 <ImageButton android:id="@+id/security_button" |
| 21 style="@style/LocationBarButton" |
| 22 android:layout_height="match_parent" |
| 23 android:layout_width="match_parent" |
| 24 android:scaleType="center" |
| 25 android:layout_gravity="center" |
| 26 android:alpha="0" |
| 27 android:visibility="invisible" |
| 28 android:contentDescription="@string/accessibility_toolbar_btn_securi
ty_lock" /> |
| 29 </FrameLayout> |
| 30 <include |
| 31 android:id="@+id/url_container" |
| 32 android:layout_width="match_parent" |
| 33 android:layout_height="match_parent" |
| 34 android:layout_marginTop="3dp" |
| 35 android:layout_marginBottom="3dp" |
| 36 android:layout_marginStart="@dimen/location_bar_icon_width" |
| 37 android:layout_marginEnd="80dp" |
| 38 android:layout_gravity="center_vertical" |
| 39 android:nextFocusForward="@+id/menu_button" |
| 40 layout="@layout/url_container" |
| 41 /> |
| 42 <org.chromium.chrome.browser.widget.TintedImageButton |
| 43 android:id="@+id/delete_button" |
| 44 style="@style/LocationBarButton" |
| 45 android:layout_width="40dp" |
| 46 android:layout_height="match_parent" |
| 47 android:scaleType="center" |
| 48 android:layout_marginEnd="44dp" |
| 49 android:layout_gravity="end" |
| 50 android:src="@drawable/btn_delete_url" |
| 51 android:visibility="gone" |
| 52 android:contentDescription="@string/accessibility_toolbar_btn_delete_url
" /> |
| 53 <!-- delete_button and bookmark_button overlap, so they should have the same
right margin --> |
| 54 <org.chromium.chrome.browser.widget.TintedImageButton |
| 55 android:id="@+id/bookmark_button" |
| 56 style="@style/LocationBarButton" |
| 57 android:layout_width="40dp" |
| 58 android:layout_height="match_parent" |
| 59 android:scaleType="center" |
| 60 android:layout_marginEnd="40dp" |
| 61 android:layout_gravity="end" |
| 62 android:paddingStart="0dp" |
| 63 android:paddingEnd="0dp" |
| 64 android:contentDescription="@string/accessibility_menu_bookmark" /> |
| 65 <org.chromium.chrome.browser.widget.TintedImageButton |
| 66 android:id="@+id/mic_button" |
| 67 style="@style/LocationBarButton" |
| 68 android:layout_width="40dp" |
| 69 android:layout_height="match_parent" |
| 70 android:scaleType="center" |
| 71 android:layout_gravity="end" |
| 72 android:paddingStart="0dp" |
| 73 android:paddingEnd="0dp" |
| 74 android:nextFocusForward="@+id/menu_button" |
| 75 android:src="@drawable/btn_mic" |
| 76 android:contentDescription="@string/accessibility_toolbar_btn_mic" /> |
| 77 </merge> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1141283003:
Upstream oodles of Chrome for Android code into Chromium. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master