Chromium Code Reviews Chromium Code Reviews
Issue 2560043002:
ControlContainer is now a child of CompositorViewHolder (Closed)
| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2016 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 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 5 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer xmlns:android="http ://schemas.android.com/apk/res/android" |
| 6 android:layout_height="match_parent" | 6 android:id="@+id/control_container" |
| 7 android:layout_width="wrap_content"> | 7 android:layout_width="match_parent" |
| 8 <org.chromium.chrome.browser.toolbar.ToolbarControlContainer | 8 android:layout_height="wrap_content" |
| 9 android:id="@+id/control_container" | 9 android:layout_gravity="bottom" |
| 10 android:minHeight="@dimen/control_container_height" > | |
| 11 <view | |
| 12 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$Toolb arViewResourceFrameLayout" | |
| 13 android:id="@+id/toolbar_container" | |
| 10 android:layout_width="match_parent" | 14 android:layout_width="match_parent" |
| 11 android:layout_height="wrap_content" | 15 android:layout_height="wrap_content"> |
| 12 android:layout_alignParentBottom="true" | 16 <ImageView |
| 13 android:gravity="bottom" | 17 android:id="@+id/toolbar_shadow" |
| 14 android:minHeight="@dimen/control_container_height" > | |
| 15 <view | |
| 16 class="org.chromium.chrome.browser.toolbar.ToolbarControlContainer$T oolbarViewResourceFrameLayout" | |
| 17 android:id="@+id/toolbar_container" | |
| 18 android:layout_width="match_parent" | 18 android:layout_width="match_parent" |
| 19 android:layout_height="wrap_content"> | 19 android:layout_height="@dimen/toolbar_shadow_height" |
| 20 <ImageView | 20 android:src="@drawable/toolbar_shadow" |
| 21 android:id="@+id/toolbar_shadow" | 21 android:scaleType="fitXY" |
| 22 android:layout_width="match_parent" | 22 android:scaleY="-1" |
| 23 android:layout_height="@dimen/toolbar_shadow_height" | 23 android:contentDescription="@null" /> |
| 24 android:src="@drawable/toolbar_shadow" | 24 <ViewStub |
| 25 android:scaleType="fitXY" | 25 android:id="@+id/toolbar_stub" |
| 26 android:scaleY="-1" | 26 android:layout_width="match_parent" |
| 27 android:contentDescription="@null" /> | 27 android:layout_height="@dimen/toolbar_height_no_shadow" |
| 28 <ViewStub | 28 android:layout_marginTop="@dimen/toolbar_shadow_height" /> |
| 29 android:id="@+id/toolbar_stub" | 29 <ViewStub |
| 30 android:layout_width="match_parent" | 30 android:id="@+id/find_toolbar_stub" |
| 31 android:layout_height="@dimen/toolbar_height_no_shadow" | 31 android:inflatedId="@+id/find_toolbar" |
|
gone
2017/01/13 18:31:08
nit: shove visibility below the layout lines
mdjones
2017/01/13 19:56:41
Done.
| |
| 32 android:layout_marginTop="@dimen/toolbar_shadow_height" /> | 32 android:visibility="gone" |
| 33 <ViewStub | 33 android:layout_marginTop="@dimen/toolbar_shadow_height" |
| 34 android:id="@+id/find_toolbar_stub" | 34 android:layout_width="match_parent" |
| 35 android:inflatedId="@+id/find_toolbar" | 35 android:layout_height="@dimen/toolbar_height_no_shadow" |
| 36 android:visibility="gone" | 36 android:layout="@layout/find_toolbar" /> |
| 37 android:layout_marginTop="@dimen/toolbar_shadow_height" | 37 </view> |
| 38 android:layout_width="match_parent" | 38 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> |
| 39 android:layout_height="@dimen/toolbar_height_no_shadow" | |
| 40 android:layout="@layout/find_toolbar" /> | |
| 41 </view> | |
| 42 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> | |
| 43 </RelativeLayout> | |
| OLD | NEW |
