| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 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 | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 7 <LinearLayout | 7 <LinearLayout |
| 8 android:layout_width="match_parent" | 8 android:layout_width="match_parent" |
| 9 android:layout_height="match_parent" | 9 android:layout_height="match_parent" |
| 10 android:orientation="vertical"> | 10 android:orientation="vertical"> |
| 11 | 11 |
| 12 <org.chromium.chrome.browser.compositor.CompositorViewHolder | 12 <org.chromium.chrome.browser.compositor.CompositorViewHolder |
| 13 android:id="@+id/compositor_view_holder" | 13 android:id="@+id/compositor_view_holder" |
| 14 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
| 15 android:layout_height="0dp" | 15 android:layout_height="0dp" |
| 16 android:layout_weight="1" /> | 16 android:layout_weight="1" /> |
| 17 | 17 |
| 18 <HorizontalScrollView | 18 <HorizontalScrollView |
| 19 android:id="@+id/keyboard_accessory" | 19 android:id="@+id/keyboard_accessory" |
| 20 android:layout_height="@dimen/keyboard_accessory_height" | 20 android:layout_height="@dimen/keyboard_accessory_height" |
| 21 android:layout_width="match_parent" | 21 android:layout_width="match_parent" |
| 22 android:background="@drawable/keyboard_accessory_background" | 22 android:background="@drawable/keyboard_accessory_background" |
| 23 android:contentDescription="@string/autofill_keyboard_accessory_cont
ent_description" | 23 android:contentDescription="@string/autofill_keyboard_accessory_cont
ent_description" |
| 24 android:fillViewport="true" | 24 android:fillViewport="true" |
| 25 android:scrollbars="none" | 25 android:scrollbars="none" |
| 26 android:visibility="gone" /> | 26 android:visibility="gone" /> |
| 27 |
| 28 <org.chromium.chrome.browser.widget.FadingShadowView |
| 29 android:id="@+id/bottombar_shadow" |
| 30 android:layout_width="match_parent" |
| 31 android:layout_height="2dp" |
| 32 android:layout_marginTop="-2dp" |
| 33 android:visibility="gone" /> |
| 34 |
| 35 <ViewStub |
| 36 android:id="@+id/bottombar_stub" |
| 37 android:layout_width="match_parent" |
| 38 android:layout_height="wrap_content" /> |
| 27 </LinearLayout> | 39 </LinearLayout> |
| 28 | 40 |
| 29 <ViewStub | 41 <ViewStub |
| 30 android:id="@+id/omnibox_results_container_stub" | 42 android:id="@+id/omnibox_results_container_stub" |
| 31 android:layout_width="match_parent" | 43 android:layout_width="match_parent" |
| 32 android:layout_height="match_parent" | 44 android:layout_height="match_parent" |
| 33 android:layout_marginTop="@dimen/tab_strip_height" | 45 android:layout_marginTop="@dimen/tab_strip_height" |
| 34 android:inflatedId="@+id/omnibox_results_container" | 46 android:inflatedId="@+id/omnibox_results_container" |
| 35 android:layout="@layout/omnibox_results_container" /> | 47 android:layout="@layout/omnibox_results_container" /> |
| 36 | 48 |
| 37 <!-- Toolbar size area painted black to avoid the action bar showing the win
dow background --> | 49 <!-- Toolbar size area painted black to avoid the action bar showing the win
dow background --> |
| 38 <View | 50 <View |
| 39 android:id="@+id/action_bar_black_background" | 51 android:id="@+id/action_bar_black_background" |
| 40 android:layout_width="match_parent" | 52 android:layout_width="match_parent" |
| 41 android:layout_height="@dimen/toolbar_height_no_shadow" | 53 android:layout_height="@dimen/toolbar_height_no_shadow" |
| 42 android:background="#000000" | 54 android:background="#000000" |
| 43 android:visibility="gone" /> | 55 android:visibility="gone" /> |
| 44 <ViewStub | 56 <ViewStub |
| 45 android:id="@+id/control_container_stub" | 57 android:id="@+id/control_container_stub" |
| 46 android:layout_width="match_parent" | 58 android:layout_width="match_parent" |
| 47 android:layout_height="wrap_content" /> | 59 android:layout_height="wrap_content" /> |
| 48 <ViewStub | 60 <ViewStub |
| 49 android:id="@+id/empty_container_stub" | 61 android:id="@+id/empty_container_stub" |
| 50 android:inflatedId="@+id/empty_container" | 62 android:inflatedId="@+id/empty_container" |
| 51 android:layout="@layout/empty_background_view" | 63 android:layout="@layout/empty_background_view" |
| 52 android:layout_width="match_parent" | 64 android:layout_width="match_parent" |
| 53 android:layout_height="match_parent" | 65 android:layout_height="match_parent" /> |
| 54 /> | |
| 55 <!-- This empty view is used as the anchor for custom menu --> | 66 <!-- This empty view is used as the anchor for custom menu --> |
| 56 <View | 67 <View |
| 57 android:id="@+id/menu_anchor_stub" | 68 android:id="@+id/menu_anchor_stub" |
| 58 android:layout_width="0px" | 69 android:layout_width="0px" |
| 59 android:layout_height="0px" | 70 android:layout_height="0px" |
| 60 android:layout_gravity="bottom|start" | 71 android:layout_gravity="bottom|start" |
| 61 /> | 72 /> |
| 62 </merge> | 73 </merge> |
| OLD | NEW |