Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- | 2 <!-- |
| 3 Copyright 2013 The Chromium Authors. All rights reserved. | 3 Copyright 2013 The Chromium Authors. All rights reserved. |
| 4 | 4 |
| 5 Use of this source code is governed by a BSD-style license that can be | 5 Use of this source code is governed by a BSD-style license that can be |
| 6 found in the LICENSE file. | 6 found in the LICENSE file. |
| 7 --> | 7 --> |
| 8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 8 <LinearLayout |
| 9 xmlns:android="http://schemas.android.com/apk/res/android" | |
| 10 xmlns:chrome="http://schemas.android.com/apk/res-auto" | |
| 9 android:layout_width="match_parent" | 11 android:layout_width="match_parent" |
| 10 android:layout_height="match_parent" | 12 android:layout_height="match_parent" |
| 11 android:paddingBottom="8dp" | 13 android:paddingBottom="8dp" |
| 12 android:background="#ffffff" | 14 android:background="#ffffff" |
| 13 android:orientation="vertical" > | 15 android:orientation="vertical" > |
| 14 | 16 |
| 15 <LinearLayout | 17 <LinearLayout |
| 16 android:layout_width="match_parent" | 18 android:layout_width="match_parent" |
| 17 android:layout_height="wrap_content" | 19 android:layout_height="wrap_content" |
| 18 android:orientation="vertical" | 20 android:orientation="vertical" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 51 <TextView | 53 <TextView |
| 52 android:id="@+id/website_settings_connection_message" | 54 android:id="@+id/website_settings_connection_message" |
| 53 android:layout_width="match_parent" | 55 android:layout_width="match_parent" |
| 54 android:layout_height="wrap_content" | 56 android:layout_height="wrap_content" |
| 55 android:lineSpacingExtra="3dp" | 57 android:lineSpacingExtra="3dp" |
| 56 android:paddingTop="8dp" | 58 android:paddingTop="8dp" |
| 57 android:textColor="@color/website_settings_popup_text" | 59 android:textColor="@color/website_settings_popup_text" |
| 58 android:textSize="14sp" /> | 60 android:textSize="14sp" /> |
| 59 </LinearLayout> | 61 </LinearLayout> |
| 60 | 62 |
| 63 <org.chromium.ui.widget.ButtonCompat | |
| 64 android:id="@+id/website_settings_instant_app_button" | |
| 65 android:layout_width="wrap_content" | |
| 66 android:layout_height="wrap_content" | |
| 67 android:layout_gravity="start" | |
| 68 android:layout_marginEnd="@dimen/website_settings_popup_padding_sides" | |
| 69 android:layout_marginStart="@dimen/website_settings_popup_padding_sides" | |
| 70 android:layout_marginTop="12dp" | |
| 71 android:layout_marginBottom="4dp" | |
|
Maria
2016/09/26 17:36:25
I wish I understood when @dimen is used and when i
Ted C
2016/09/26 18:05:04
For me, @dimen is for sharing, otherwise inline an
| |
| 72 android:paddingEnd="@dimen/website_settings_popup_button_padding_sides" | |
| 73 android:paddingStart="@dimen/website_settings_popup_button_padding_sides " | |
| 74 android:text="@string/page_info_instant_app_button" | |
| 75 android:textSize="14sp" | |
| 76 android:textColor="#fff" | |
|
Maria
2016/09/26 17:36:25
@color?
Ted C
2016/09/26 18:05:04
switched to @android:color/white
| |
| 77 chrome:buttonRaised="false" | |
| 78 chrome:buttonColor="@color/app_banner_install_button_bg" /> | |
| 79 | |
| 61 <LinearLayout | 80 <LinearLayout |
| 62 android:id="@+id/website_settings_permissions_list" | 81 android:id="@+id/website_settings_permissions_list" |
| 63 android:layout_width="match_parent" | 82 android:layout_width="match_parent" |
| 64 android:layout_height="wrap_content" | 83 android:layout_height="wrap_content" |
| 65 android:orientation="vertical" | 84 android:orientation="vertical" |
| 66 android:paddingStart="@dimen/website_settings_popup_padding_sides" | 85 android:paddingStart="@dimen/website_settings_popup_padding_sides" |
| 67 android:paddingEnd="@dimen/website_settings_popup_padding_sides" > | 86 android:paddingEnd="@dimen/website_settings_popup_padding_sides" > |
| 68 </LinearLayout> | 87 </LinearLayout> |
| 69 | 88 |
| 70 <Button | 89 <Button |
| 71 android:id="@+id/website_settings_site_settings_button" | 90 android:id="@+id/website_settings_site_settings_button" |
| 72 android:layout_width="wrap_content" | 91 android:layout_width="wrap_content" |
| 73 android:layout_height="@dimen/website_settings_popup_button_height" | 92 android:layout_height="@dimen/website_settings_popup_button_height" |
| 74 android:layout_gravity="end" | 93 android:layout_gravity="end" |
| 75 android:layout_marginEnd="@dimen/website_settings_popup_padding_sides" | 94 android:layout_marginEnd="@dimen/website_settings_popup_padding_sides" |
| 76 android:layout_marginStart="@dimen/website_settings_popup_padding_sides" | 95 android:layout_marginStart="@dimen/website_settings_popup_padding_sides" |
| 77 android:layout_marginTop="8dp" | 96 android:layout_marginTop="8dp" |
| 78 android:paddingEnd="@dimen/website_settings_popup_button_padding_sides" | 97 android:paddingEnd="@dimen/website_settings_popup_button_padding_sides" |
| 79 android:paddingStart="@dimen/website_settings_popup_button_padding_sides " | 98 android:paddingStart="@dimen/website_settings_popup_button_padding_sides " |
| 80 android:text="@string/page_info_site_settings_button" | 99 android:text="@string/page_info_site_settings_button" |
| 81 android:textColor="@color/light_active_color" | 100 android:textColor="@color/light_active_color" |
| 82 style="@style/ButtonCompatBorderless" /> | 101 style="@style/ButtonCompatBorderless" /> |
| 83 </LinearLayout> | 102 </LinearLayout> |
| OLD | NEW |