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 xmlns:android="http://schemas.android.com/apk/res/android" |
| 9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
| 10 android:layout_height="match_parent" | 10 android:layout_height="match_parent" |
| 11 android:paddingBottom="8dp" | 11 android:paddingBottom="8dp" |
| 12 android:background="#ffffff" | 12 android:background="#ffffff" |
| 13 android:orientation="vertical" > | 13 android:orientation="vertical" > |
| 14 | 14 |
| 15 <LinearLayout | 15 <LinearLayout |
| 16 android:layout_width="match_parent" | 16 android:layout_width="match_parent" |
| 17 android:layout_height="wrap_content" | 17 android:layout_height="wrap_content" |
| 18 android:orientation="vertical" | 18 android:orientation="vertical" |
| 19 android:paddingBottom="12dp" | 19 android:paddingBottom="12dp" |
| 20 android:paddingEnd="@dimen/website_settings_popup_padding_sides" | 20 android:paddingEnd="@dimen/website_settings_popup_padding_sides" |
| 21 android:paddingStart="@dimen/website_settings_popup_padding_sides" > | 21 android:paddingStart="@dimen/website_settings_popup_padding_sides" > |
| 22 | 22 |
| 23 <view class="org.chromium.chrome.browser.pageinfo.WebsiteSettingsPopup$E lidedUrlTextView" | 23 <LinearLayout |
| 24 android:id="@+id/website_settings_url" | |
| 25 android:layout_width="match_parent" | 24 android:layout_width="match_parent" |
| 26 android:layout_height="wrap_content" | 25 android:layout_height="wrap_content" |
| 27 android:ellipsize="end" | 26 android:orientation="horizontal" |
| 28 android:lineSpacingExtra="6dp" | 27 android:paddingTop="16dp" > |
| 29 android:paddingTop="16dp" | 28 |
| 30 android:textAlignment="viewStart" | 29 <ImageView android:id="@+id/status_icon" |
|
Ted C
2016/02/26 20:57:37
Instead of adding the ImageView, can you try calli
fgorski
2016/02/26 22:33:26
Renamed. I tried the content drawables, but that i
| |
| 31 android:textColor="@color/url_emphasis_default_text" | 30 style="@style/LocationBarButton" |
| 32 android:textSize="16sp"/> | 31 android:layout_width="wrap_content" |
| 32 android:layout_height="wrap_content" | |
| 33 android:layout_gravity="start|top" | |
| 34 android:paddingEnd="12dp" | |
| 35 android:src="@drawable/offline_bolt" | |
| 36 android:alpha="0.54" | |
|
Ted C
2016/02/26 20:57:37
do you need the alpha or the new assets negate the
fgorski
2016/02/26 22:33:26
Done.
| |
| 37 android:visibility="gone" | |
| 38 android:contentDescription="@string/accessibility_toolbar_btn_si te_info" /> | |
|
Ted C
2016/02/26 20:57:37
we should have a specific accessibility string. t
fgorski
2016/02/26 22:33:26
Done.
| |
| 39 | |
| 40 <view class="org.chromium.chrome.browser.pageinfo.WebsiteSettingsPop up$ElidedUrlTextView" | |
| 41 android:id="@+id/website_settings_url" | |
| 42 android:layout_width="match_parent" | |
| 43 android:layout_height="wrap_content" | |
| 44 android:ellipsize="end" | |
| 45 android:lineSpacingExtra="6dp" | |
| 46 android:textAlignment="viewStart" | |
| 47 android:textColor="@color/url_emphasis_default_text" | |
| 48 android:textSize="16sp"/> | |
| 49 | |
| 50 </LinearLayout> | |
| 33 | 51 |
| 34 <TextView | 52 <TextView |
| 35 android:id="@+id/website_settings_connection_message" | 53 android:id="@+id/website_settings_connection_message" |
| 36 android:layout_width="match_parent" | 54 android:layout_width="match_parent" |
| 37 android:layout_height="wrap_content" | 55 android:layout_height="wrap_content" |
| 38 android:lineSpacingExtra="3dp" | 56 android:lineSpacingExtra="3dp" |
| 39 android:paddingTop="8dp" | 57 android:paddingTop="8dp" |
| 40 android:textColor="@color/website_settings_popup_text" | 58 android:textColor="@color/website_settings_popup_text" |
| 41 android:textSize="14sp" /> | 59 android:textSize="14sp" /> |
| 42 </LinearLayout> | 60 </LinearLayout> |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 57 android:layout_gravity="end" | 75 android:layout_gravity="end" |
| 58 android:layout_marginEnd="@dimen/website_settings_popup_padding_sides" | 76 android:layout_marginEnd="@dimen/website_settings_popup_padding_sides" |
| 59 android:layout_marginStart="@dimen/website_settings_popup_padding_sides" | 77 android:layout_marginStart="@dimen/website_settings_popup_padding_sides" |
| 60 android:layout_marginTop="8dp" | 78 android:layout_marginTop="8dp" |
| 61 android:paddingEnd="@dimen/website_settings_popup_button_padding_sides" | 79 android:paddingEnd="@dimen/website_settings_popup_button_padding_sides" |
| 62 android:paddingStart="@dimen/website_settings_popup_button_padding_sides " | 80 android:paddingStart="@dimen/website_settings_popup_button_padding_sides " |
| 63 android:text="@string/page_info_site_settings_button" | 81 android:text="@string/page_info_site_settings_button" |
| 64 android:textColor="@color/light_active_color" | 82 android:textColor="@color/light_active_color" |
| 65 style="@style/ButtonCompatBorderless" /> | 83 style="@style/ButtonCompatBorderless" /> |
| 66 </LinearLayout> | 84 </LinearLayout> |
| OLD | NEW |