| 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 | 10 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 android:scaleType="fitXY" | 30 android:scaleType="fitXY" |
| 31 android:contentDescription="@null" /> | 31 android:contentDescription="@null" /> |
| 32 | 32 |
| 33 <FrameLayout | 33 <FrameLayout |
| 34 android:id="@+id/toolbar" | 34 android:id="@+id/toolbar" |
| 35 android:layout_width="match_parent" | 35 android:layout_width="match_parent" |
| 36 android:layout_height="@dimen/toolbar_height_no_shadow" | 36 android:layout_height="@dimen/toolbar_height_no_shadow" |
| 37 android:background="@android:color/white" | 37 android:background="@android:color/white" |
| 38 android:clickable="true" > | 38 android:clickable="true" > |
| 39 | 39 |
| 40 <!-- TODO(dfalcantara): Ask UX about what to do for tablets. --> | |
| 41 <org.chromium.chrome.browser.searchwidget.SearchActivityLocationBarLayou
t | 40 <org.chromium.chrome.browser.searchwidget.SearchActivityLocationBarLayou
t |
| 42 android:id="@+id/search_location_bar" | 41 android:id="@+id/search_location_bar" |
| 43 android:layout_width="match_parent" | 42 android:layout_width="match_parent" |
| 44 android:layout_height="wrap_content" | 43 android:layout_height="wrap_content" |
| 45 android:layout_gravity="center_vertical" | 44 android:layout_gravity="center_vertical" |
| 46 android:layout_marginStart="@dimen/tablet_toolbar_start_padding_
no_buttons" | 45 android:layout_marginStart="@dimen/search_activity_location_bar_
margin_start" |
| 47 android:layout_marginEnd="@dimen/tablet_toolbar_start_padding_no
_buttons" /> | 46 android:layout_marginEnd="@dimen/search_activity_location_bar_ma
rgin_end" /> |
| 48 | 47 |
| 49 </FrameLayout> | 48 </FrameLayout> |
| 50 | 49 |
| 51 <FrameLayout | 50 <FrameLayout |
| 52 android:id="@+id/bottom_container" | 51 android:id="@+id/bottom_container" |
| 53 android:layout_width="match_parent" | 52 android:layout_width="match_parent" |
| 54 android:layout_height="match_parent" /> | 53 android:layout_height="match_parent" /> |
| 55 | 54 |
| 56 </FrameLayout> | 55 </FrameLayout> |
| OLD | NEW |