Chromium Code Reviews Chromium Code Reviews
Issue 1526323003:
Add Physical Web opt-in dialog (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| (Empty) | |
| 1 <?xml version="1.0" encoding="utf-8"?> | |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | |
| 3 Use of this source code is governed by a BSD-style license that can be | |
| 4 found in the LICENSE file. --> | |
| 5 | |
| 6 <merge | |
| 7 xmlns:android="http://schemas.android.com/apk/res/android" > | |
| 8 | |
|
gone
2015/12/28 22:27:03
This looks broken because you're assuming that the
mattreynolds
2015/12/28 23:11:22
I couldn't find a way to use a LinearLayout that w
gone
2015/12/28 23:31:41
For future reference, the original CL that changed
| |
| 9 <ScrollView | |
| 10 android:layout_height="match_parent" | |
| 11 android:layout_width="match_parent" | |
| 12 android:layout_marginBottom="57dp" | |
| 13 android:fillViewport="true" | |
| 14 android:scrollbarStyle="outsideOverlay" > | |
| 15 | |
| 16 <LinearLayout | |
| 17 android:layout_height="wrap_content" | |
| 18 android:layout_width="match_parent" | |
| 19 android:paddingStart="40dp" | |
| 20 android:paddingEnd="40dp" | |
| 21 android:gravity="center" | |
| 22 android:orientation="vertical" > | |
| 23 | |
| 24 <ImageView | |
| 25 android:layout_height="140dp" | |
| 26 android:layout_width="140dp" | |
| 27 android:src="@drawable/physical_web_logo" | |
| 28 android:contentDescription="@null" /> | |
| 29 <TextView | |
| 30 android:layout_height="wrap_content" | |
| 31 android:layout_width="wrap_content" | |
| 32 android:layout_marginTop="10dp" | |
| 33 android:layout_marginBottom="20dp" | |
| 34 android:text="@string/physical_web_optin_title" | |
| 35 android:textSize="24sp" | |
| 36 android:textColor="@android:color/black" /> | |
| 37 <TextView | |
| 38 android:layout_height="wrap_content" | |
| 39 android:layout_width="match_parent" | |
| 40 android:text="@string/physical_web_optin_description" | |
| 41 android:textSize="16sp" | |
| 42 android:textColor="@color/light_normal_color" /> | |
| 43 | |
| 44 </LinearLayout> | |
| 45 | |
| 46 </ScrollView> | |
| 47 | |
| 48 <View | |
| 49 style="@style/ButtonBarTopDivider" | |
| 50 android:layout_gravity="bottom" | |
| 51 android:layout_marginBottom="56dp" /> | |
| 52 | |
| 53 <LinearLayout | |
| 54 android:layout_width="match_parent" | |
| 55 android:layout_height="56dp" | |
| 56 android:layout_gravity="bottom" | |
| 57 android:orientation="horizontal" > | |
| 58 | |
| 59 <!--suppress ButtonStyle --> | |
| 60 <Button | |
| 61 android:id="@+id/physical_web_decline" | |
| 62 android:layout_width="0dp" | |
| 63 android:layout_height="match_parent" | |
| 64 android:layout_weight="1" | |
| 65 android:background="?attr/listChoiceBackgroundIndicator" | |
| 66 android:gravity="start|center_vertical" | |
| 67 android:textDirection="locale" | |
| 68 android:paddingStart="16dp" | |
| 69 android:paddingEnd="16dp" | |
| 70 android:text="@string/no_thanks" | |
| 71 android:textAllCaps="true" | |
| 72 android:textColor="@color/light_normal_color" | |
| 73 android:textSize="14sp" /> | |
| 74 | |
| 75 <!--suppress ButtonStyle --> | |
| 76 <Button | |
| 77 android:id="@+id/physical_web_enable" | |
| 78 android:layout_width="0dp" | |
| 79 android:layout_height="match_parent" | |
| 80 android:layout_weight="1" | |
| 81 android:background="?attr/listChoiceBackgroundIndicator" | |
| 82 android:gravity="end|center_vertical" | |
| 83 android:textDirection="locale" | |
| 84 android:paddingStart="16dp" | |
| 85 android:paddingEnd="16dp" | |
| 86 android:text="@string/enable" | |
| 87 android:textAllCaps="true" | |
| 88 android:textColor="@color/light_active_color" | |
| 89 android:textSize="14sp" /> | |
| 90 | |
| 91 </LinearLayout> | |
| 92 | |
| 93 </merge> | |
| OLD | NEW |
