Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chrome/android/java_staging/res/layout/location_bar.xml

Issue 1141283003: Upstream oodles of Chrome for Android code into Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: final patch? Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java_staging/res/layout/location_bar.xml
diff --git a/chrome/android/java_staging/res/layout/location_bar.xml b/chrome/android/java_staging/res/layout/location_bar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3141feee24dde7dafde210a7c455054d9c1d6b6f
--- /dev/null
+++ b/chrome/android/java_staging/res/layout/location_bar.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<!-- The location bar also know as URL bar -->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <ImageView android:id="@+id/incognito_badge"
+ style="@style/LocationBarButton"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:scaleType="center"
+ android:src="@drawable/ic_omnibox_incognito_badge"
+ android:contentDescription="@null"
+ android:visibility="gone" />
+ <FrameLayout android:id="@+id/location_bar_icon"
+ android:layout_width="@dimen/location_bar_icon_width"
+ android:layout_height="match_parent"
+ android:visibility="gone">
+ <ImageView android:id="@+id/navigation_button"
+ style="@style/LocationBarButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:scaleType="center"
+ android:contentDescription="@null"/>
+ <ImageButton android:id="@+id/security_button"
+ style="@style/LocationBarButton"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:scaleType="center"
+ android:layout_gravity="center"
+ android:alpha="0"
+ android:visibility="invisible"
+ android:contentDescription="@string/accessibility_toolbar_btn_security_lock" />
+ </FrameLayout>
+ <include
+ android:id="@+id/url_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="3dp"
+ android:layout_marginBottom="3dp"
+ android:layout_marginStart="@dimen/location_bar_icon_width"
+ android:layout_gravity="center_vertical"
+ android:nextFocusForward="@+id/tab_switcher_button"
+ layout="@layout/url_container"
+ />
+ <FrameLayout android:id="@+id/url_action_container"
+ android:layout_width="@dimen/location_bar_icon_width"
+ android:layout_height="@dimen/toolbar_height_no_shadow"
+ android:layout_gravity="end|center_vertical"
+ android:visibility="gone">
+ <org.chromium.chrome.browser.widget.TintedImageButton
+ android:id="@+id/document_menu_button"
+ style="@style/LocationBarButton"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:src="@drawable/btn_menu"
+ android:contentDescription="@string/accessibility_toolbar_btn_menu" />
+ <org.chromium.chrome.browser.widget.TintedImageButton
+ android:id="@+id/delete_button"
+ style="@style/LocationBarButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="center"
+ android:src="@drawable/btn_delete_url"
+ android:visibility="invisible"
+ android:contentDescription="@string/accessibility_toolbar_btn_delete_url" />
+ <org.chromium.chrome.browser.widget.TintedImageButton
+ android:id="@+id/mic_button"
+ style="@style/LocationBarButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="center"
+ android:src="@drawable/btn_mic"
+ android:visibility="invisible"
+ android:contentDescription="@string/accessibility_toolbar_btn_mic" />
+ </FrameLayout>
+</merge>
« no previous file with comments | « chrome/android/java_staging/res/layout/icon_most_visited_layout.xml ('k') | chrome/android/java_staging/res/layout/main.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698