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

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

Issue 2850063002: ❄ Split off RadioButtonLayout from InfoBarControls (Closed)
Patch Set: Fix again 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
OLDNEW
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 <!-- This XML should not be inflated by anything except PromoDialog.java. 6 <!-- This XML should not be inflated by anything except PromoDialog.java.
7 7
8 This layout is deeply nested to account for the various bits having to flop orientations 8 This layout is deeply nested to account for the various bits having to flop orientations
9 in landscape. If these become more frequently used, we should investigate optimizing the 9 in landscape. If these become more frequently used, we should investigate optimizing the
10 layout. 10 layout.
11 --> 11 -->
12 <merge xmlns:android="http://schemas.android.com/apk/res/android" 12 <merge xmlns:android="http://schemas.android.com/apk/res/android"
13 xmlns:chrome="http://schemas.android.com/apk/res-auto" > 13 xmlns:chrome="http://schemas.android.com/apk/res-auto" >
14 14
15 <org.chromium.chrome.browser.widget.PromoDialogLayout 15 <org.chromium.chrome.browser.widget.PromoDialogLayout
16 android:id="@+id/promo_dialog_layout" 16 android:id="@+id/promo_dialog_layout"
17 android:layout_width="wrap_content" 17 android:layout_width="wrap_content"
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 android:layout_gravity="center" 19 android:layout_gravity="center"
20 android:orientation="vertical" 20 android:orientation="vertical"
21 android:background="@drawable/menu_bg" 21 android:background="@drawable/menu_bg"
22 chrome:maxWidth="@dimen/promo_dialog_max_width" > 22 chrome:maxWidth="@dimen/promo_dialog_max_width" >
23 23
24 <org.chromium.chrome.browser.widget.FadingEdgeScrollView 24 <org.chromium.chrome.browser.widget.FadingEdgeScrollView
25 android:id="@+id/promo_container" 25 android:id="@+id/promo_container"
26 android:layout_width="wrap_content" 26 android:layout_width="match_parent"
27 android:layout_height="0dp" 27 android:layout_height="0dp"
28 android:layout_weight="1" 28 android:layout_weight="1"
29 android:fadeScrollbars="false" > 29 android:fadeScrollbars="false" >
30 30
31 <!-- This layout pivots when the dialog is wider than it is tall. -- > 31 <!-- This layout pivots when the dialog is wider than it is tall. -- >
32 <LinearLayout 32 <LinearLayout
33 android:id="@+id/full_promo_content" 33 android:id="@+id/full_promo_content"
34 android:layout_width="wrap_content" 34 android:layout_width="wrap_content"
35 android:layout_height="wrap_content" 35 android:layout_height="wrap_content"
36 android:padding="@dimen/promo_dialog_padding" 36 android:padding="@dimen/promo_dialog_padding"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 </org.chromium.chrome.browser.widget.BoundedLinearLayout> 74 </org.chromium.chrome.browser.widget.BoundedLinearLayout>
75 </LinearLayout> 75 </LinearLayout>
76 76
77 </org.chromium.chrome.browser.widget.FadingEdgeScrollView> 77 </org.chromium.chrome.browser.widget.FadingEdgeScrollView>
78 78
79 <ViewStub 79 <ViewStub
80 android:id="@+id/footer_stub" 80 android:id="@+id/footer_stub"
81 android:layout="@layout/infobar_control_description" 81 android:layout="@layout/infobar_control_description"
82 android:inflatedId="@+id/footer" 82 android:inflatedId="@+id/footer"
83 android:layout_margin="@dimen/promo_dialog_padding" 83 android:layout_margin="@dimen/promo_dialog_padding"
84 android:layout_width="wrap_content" 84 android:layout_width="match_parent"
85 android:layout_height="wrap_content" /> 85 android:layout_height="wrap_content" />
86 86
87 <org.chromium.chrome.browser.widget.DualControlLayout 87 <org.chromium.chrome.browser.widget.DualControlLayout
88 android:id="@+id/button_bar" 88 android:id="@+id/button_bar"
89 android:layout_width="wrap_content" 89 android:layout_width="match_parent"
90 android:layout_height="wrap_content" 90 android:layout_height="wrap_content"
91 android:layout_gravity="end" 91 android:layout_gravity="end"
92 android:padding="@dimen/promo_dialog_padding" 92 android:padding="@dimen/promo_dialog_padding"
93 chrome:buttonAlignment="end" 93 chrome:buttonAlignment="end"
94 chrome:stackedMargin="@dimen/infobar_padding" /> 94 chrome:stackedMargin="@dimen/infobar_padding" />
95 95
96 </org.chromium.chrome.browser.widget.PromoDialogLayout> 96 </org.chromium.chrome.browser.widget.PromoDialogLayout>
97 97
98 </merge> 98 </merge>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698