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

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

Issue 2683653007: Show a Google "G" in the omnibox on the New Tab Page. (Closed)
Patch Set: findbugs Created 3 years, 10 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/res/layout/location_bar.xml
diff --git a/chrome/android/java/res/layout/location_bar.xml b/chrome/android/java/res/layout/location_bar.xml
index b1a8a2c9425d70ff9cf4e717f674d416bd3b1d37..90709e9d23176a4336500baedd3da6e0e681caa0 100644
--- a/chrome/android/java/res/layout/location_bar.xml
+++ b/chrome/android/java/res/layout/location_bar.xml
@@ -5,6 +5,26 @@
<!-- The location bar also know as URL bar -->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- The container for the Google G is kept at a fixed width to make the horizonal translation
+ calculations work. The contents are end-aligned, so when the location bar expands,
+ the space in the start margin will be pushed out, creating the effect of both margins
+ shrinking simultaneously. -->
+ <FrameLayout android:id="@+id/google_g_container"
+ android:layout_width="@dimen/location_bar_google_g_container_width"
+ android:layout_height="match_parent" >
+
+ <ImageView android:id="@+id/google_g"
mdjones 2017/02/11 00:32:57 This block needs further indentation.
Bernhard Bauer 2017/02/13 17:18:01 Done.
+ style="@style/LocationBarButton"
+ android:layout_width="@dimen/location_bar_google_g_width"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="@dimen/location_bar_google_g_margin"
+ android:layout_gravity="end"
+ android:scaleType="fitCenter"
+ android:src="@drawable/googleg"
+ android:contentDescription="@null" />
+
+ </FrameLayout>
+
<ImageView android:id="@+id/incognito_badge"
style="@style/LocationBarButton"
android:layout_width="wrap_content"

Powered by Google App Engine
This is Rietveld 408576698