| 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 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 7 <LinearLayout |
| 8 android:layout_width="match_parent" |
| 9 android:layout_height="match_parent" |
| 10 android:orientation="vertical"> |
| 11 |
| 12 <org.chromium.chrome.browser.compositor.CompositorViewHolder |
| 13 android:id="@+id/compositor_view_holder" |
| 14 android:layout_width="match_parent" |
| 15 android:layout_height="0dp" |
| 16 android:layout_weight="1" /> |
| 17 |
| 18 <FrameLayout |
| 19 android:id="@+id/keyboard_accessory" |
| 20 android:layout_width="match_parent" |
| 21 android:layout_height="wrap_content" |
| 22 android:visibility="gone" /> |
| 23 </LinearLayout> |
| 24 |
| 25 <ViewStub |
| 26 android:id="@+id/omnibox_results_container_stub" |
| 27 android:layout_width="match_parent" |
| 28 android:layout_height="match_parent" |
| 29 android:layout_marginTop="@dimen/tab_strip_height" |
| 30 android:inflatedId="@+id/omnibox_results_container" |
| 31 android:layout="@layout/omnibox_results_container" /> |
| 32 |
| 33 <!-- Toolbar size area painted black to avoid the action bar showing the win
dow background --> |
| 34 <View |
| 35 android:id="@+id/action_bar_black_background" |
| 36 android:layout_width="match_parent" |
| 37 android:layout_height="@dimen/toolbar_height_no_shadow" |
| 38 android:background="#000000" |
| 39 android:visibility="gone" /> |
| 40 <ViewStub |
| 41 android:id="@+id/control_container_stub" |
| 42 android:layout_width="match_parent" |
| 43 android:layout_height="wrap_content" /> |
| 44 <ViewStub |
| 45 android:id="@+id/empty_container_stub" |
| 46 android:inflatedId="@+id/empty_container" |
| 47 android:layout="@layout/empty_background_view" |
| 48 android:layout_width="match_parent" |
| 49 android:layout_height="match_parent" |
| 50 /> |
| 51 <!-- This empty view is used as the anchor for custom menu --> |
| 52 <View |
| 53 android:id="@+id/menu_anchor_stub" |
| 54 android:layout_width="0px" |
| 55 android:layout_height="0px" |
| 56 android:layout_gravity="bottom|start" |
| 57 /> |
| 58 </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