🔍 Refactor LocationBarLayout to fix SearchActivity's location bar

chrome/android/java/res/layout/location_bar.xml

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 246255d4aa2394f468321b0760da8481a86f0f92..d16c3e126932bace0444d45be36597337a25de68 100644
--- a/chrome/android/java/res/layout/location_bar.xml
+++ b/chrome/android/java/res/layout/location_bar.xml
@@ -3,7 +3,9 @@
      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 -->
+<!-- Layout for the control group representing ChromeTabbedActivity's URL bar on small devices.
+     This file is overridden for tablets via Android's resource framework; check /layout-sw600dp.
+-->
 <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,
@@ -25,79 +27,5 @@
 
     </FrameLayout>
 
-    <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="@string/accessibility_toolbar_btn_site_info" />
-
-        <org.chromium.chrome.browser.widget.TintedImageButton
-            android:id="@+id/security_button"
-            style="@style/LocationBarButton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="center"
-            android:layout_gravity="center"
-            android:alpha="0"
-            android:visibility="invisible"
-            android:contentDescription="@string/accessibility_toolbar_btn_site_info" />
-
-    </FrameLayout>
-
-    <include layout="@layout/location_bar_status" />
-
-    <include
-        android:id="@+id/url_bar"
-        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_bar" />
-
-    <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/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>
+    <include layout="@layout/location_bar_base" />
 </merge>