Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: chrome/android/java/res/layout/bottom_control_container.xml

Issue 2839673002: 🏠 Polish bottom sheet content transitions (Closed)
Patch Set: end animation immediately if no previous content Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 5
6 <org.chromium.chrome.browser.widget.bottomsheet.BottomSheet 6 <org.chromium.chrome.browser.widget.bottomsheet.BottomSheet
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 android:id="@+id/bottom_sheet" 8 android:id="@+id/bottom_sheet"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="wrap_content" > 10 android:layout_height="wrap_content" >
(...skipping 16 matching lines...) Expand all
27 android:layout_height="@dimen/toolbar_shadow_height" 27 android:layout_height="@dimen/toolbar_shadow_height"
28 android:src="@drawable/toolbar_shadow" 28 android:src="@drawable/toolbar_shadow"
29 android:scaleType="fitXY" 29 android:scaleType="fitXY"
30 android:scaleY="-1" 30 android:scaleY="-1"
31 android:contentDescription="@null" /> 31 android:contentDescription="@null" />
32 32
33 <FrameLayout 33 <FrameLayout
34 android:id="@+id/toolbar_holder" 34 android:id="@+id/toolbar_holder"
35 android:layout_width="match_parent" 35 android:layout_width="match_parent"
36 android:layout_height="@dimen/bottom_control_container_height" 36 android:layout_height="@dimen/bottom_control_container_height"
37 android:layout_marginTop="@dimen/toolbar_shadow_height" > 37 android:layout_marginTop="@dimen/toolbar_shadow_height"
38 android:background="@color/default_primary_color" >
38 39
39 <ViewStub 40 <ViewStub
40 android:id="@+id/toolbar_stub" 41 android:id="@+id/toolbar_stub"
41 android:layout_width="match_parent" 42 android:layout_width="match_parent"
42 android:layout_height="match_parent" /> 43 android:layout_height="match_parent" />
43 44
44 </FrameLayout> 45 </FrameLayout>
45 46
46 <ImageView 47 <ImageView
47 android:id="@+id/toolbar_handle" 48 android:id="@+id/toolbar_handle"
(...skipping 11 matching lines...) Expand all
59 android:layout_height="@dimen/bottom_control_container_height" 60 android:layout_height="@dimen/bottom_control_container_height"
60 android:layout="@layout/find_toolbar" /> 61 android:layout="@layout/find_toolbar" />
61 62
62 </view> 63 </view>
63 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer> 64 </org.chromium.chrome.browser.toolbar.ToolbarControlContainer>
64 65
65 <FrameLayout 66 <FrameLayout
66 android:id="@+id/bottom_sheet_content" 67 android:id="@+id/bottom_sheet_content"
67 android:layout_width="match_parent" 68 android:layout_width="match_parent"
68 android:layout_height="match_parent" 69 android:layout_height="match_parent"
69 android:paddingBottom="@dimen/bottom_nav_height" /> 70 android:paddingBottom="@dimen/bottom_nav_height"
71 android:background="@color/default_primary_color" />
70 72
71 <ViewStub 73 <ViewStub
72 android:id="@+id/bottom_omnibox_results_container_stub" 74 android:id="@+id/bottom_omnibox_results_container_stub"
73 android:layout_width="match_parent" 75 android:layout_width="match_parent"
74 android:layout_height="wrap_content" 76 android:layout_height="wrap_content"
75 android:inflatedId="@+id/omnibox_results_container" 77 android:inflatedId="@+id/omnibox_results_container"
76 android:layout="@layout/omnibox_results_container" /> 78 android:layout="@layout/omnibox_results_container" />
77 79
78 <ImageView 80 <ImageView
79 android:id="@+id/toolbar_shadow" 81 android:id="@+id/toolbar_shadow"
80 android:src="@drawable/bottom_toolbar_shadow" 82 android:src="@drawable/bottom_toolbar_shadow"
81 android:layout_width="match_parent" 83 android:layout_width="match_parent"
82 android:layout_height="wrap_content" 84 android:layout_height="wrap_content"
83 android:scaleType="fitXY" 85 android:scaleType="fitXY"
84 android:contentDescription="@null" /> 86 android:contentDescription="@null" />
85 87
86 </org.chromium.chrome.browser.widget.bottomsheet.BottomSheet> 88 </org.chromium.chrome.browser.widget.bottomsheet.BottomSheet>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698