| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2017 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2017 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 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | 6 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 7 android:id="@+id/control_container" | 7 android:id="@+id/control_container" |
| 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:background="#9affffff" > | 10 android:background="@color/google_grey_500" > |
| 11 | 11 |
| 12 <!-- This view is unnecessary visually, but required for the LocationBarLayo
ut. --> | 12 <!-- This view is unnecessary visually, but required for the LocationBarLayo
ut. --> |
| 13 <org.chromium.chrome.browser.searchwidget.SearchActivityFadingBackgroundView | 13 <org.chromium.chrome.browser.searchwidget.SearchActivityFadingBackgroundView |
| 14 android:id="@+id/fading_focus_target" | 14 android:id="@+id/fading_focus_target" |
| 15 android:layout_width="0dp" | 15 android:layout_width="0dp" |
| 16 android:layout_height="0dp" /> | 16 android:layout_height="0dp" /> |
| 17 | 17 |
| 18 <ViewStub | 18 <ViewStub |
| 19 android:id="@+id/omnibox_results_container_stub" | 19 android:id="@+id/omnibox_results_container_stub" |
| 20 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 36 android:layout_width="match_parent" | 36 android:layout_width="match_parent" |
| 37 android:layout_height="@dimen/toolbar_height_no_shadow" | 37 android:layout_height="@dimen/toolbar_height_no_shadow" |
| 38 android:background="@android:color/white" | 38 android:background="@android:color/white" |
| 39 android:clickable="true" > | 39 android:clickable="true" > |
| 40 | 40 |
| 41 <!-- TODO(dfalcantara): Ask UX about what to do for tablets. --> | 41 <!-- TODO(dfalcantara): Ask UX about what to do for tablets. --> |
| 42 <org.chromium.chrome.browser.searchwidget.SearchActivityLocationBarLayou
t | 42 <org.chromium.chrome.browser.searchwidget.SearchActivityLocationBarLayou
t |
| 43 android:id="@+id/search_location_bar" | 43 android:id="@+id/search_location_bar" |
| 44 android:layout_width="match_parent" | 44 android:layout_width="match_parent" |
| 45 android:layout_height="wrap_content" | 45 android:layout_height="wrap_content" |
| 46 android:layout_gravity="center_vertical" |
| 46 android:layout_marginStart="@dimen/tablet_toolbar_start_padding_
no_buttons" | 47 android:layout_marginStart="@dimen/tablet_toolbar_start_padding_
no_buttons" |
| 47 android:layout_marginEnd="@dimen/tablet_toolbar_start_padding_no
_buttons" | 48 android:layout_marginEnd="@dimen/tablet_toolbar_start_padding_no
_buttons" /> |
| 48 android:layout_marginTop="@dimen/tablet_toolbar_start_padding_no
_buttons" /> | |
| 49 | 49 |
| 50 </FrameLayout> | 50 </FrameLayout> |
| 51 | 51 |
| 52 <FrameLayout | 52 <FrameLayout |
| 53 android:id="@+id/bottom_container" | 53 android:id="@+id/bottom_container" |
| 54 android:layout_width="match_parent" | 54 android:layout_width="match_parent" |
| 55 android:layout_height="match_parent" /> | 55 android:layout_height="match_parent" /> |
| 56 | 56 |
| 57 </FrameLayout> | 57 </FrameLayout> |
| OLD | NEW |