| OLD | NEW |
| 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 <!-- The location bar verbose status. --> | 6 <!-- The location bar verbose status. --> |
| 7 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 7 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 8 | 8 |
| 9 <TextView android:id="@+id/location_bar_verbose_status" | 9 <TextView android:id="@+id/location_bar_verbose_status" |
| 10 android:layout_width="wrap_content" | 10 android:layout_width="wrap_content" |
| 11 android:layout_height="match_parent" | 11 android:layout_height="match_parent" |
| 12 android:paddingEnd="8dp" | 12 android:paddingEnd="8dp" |
| 13 android:gravity="center_vertical" | 13 android:gravity="center_vertical" |
| 14 android:textAlignment="viewStart" | 14 android:textAlignment="viewStart" |
| 15 android:textAppearance="@android:style/TextAppearance.Medium" | 15 android:textAppearance="@android:style/TextAppearance.Medium" |
| 16 android:textColor="@color/locationbar_status_color" | 16 android:textColor="@color/locationbar_status_color" |
| 17 android:textSize="@dimen/location_bar_url_text_size" | 17 android:textSize="@dimen/location_bar_url_text_size" |
| 18 android:text="@string/location_bar_verbose_status_offline" | 18 android:text="@string/location_bar_verbose_status_offline" |
| 19 android:visibility="gone" /> | 19 android:visibility="gone" /> |
| 20 | 20 |
| 21 <!-- Separator is going to be shown or hidden together with the status defin
ed above. --> | 21 <!-- Separator is going to be shown or hidden together with the status defin
ed above. --> |
| 22 <View android:id="@+id/location_bar_verbose_status_separator" | 22 <View android:id="@+id/location_bar_verbose_status_separator" |
| 23 android:layout_width="@dimen/location_bar_status_separator_width" | 23 android:layout_width="@dimen/location_bar_status_separator_width" |
| 24 android:layout_height="match_parent" | 24 android:layout_height="24dp" |
| 25 android:layout_marginTop="8dp" | 25 android:layout_gravity="center_vertical" |
| 26 android:layout_marginBottom="8dp" | |
| 27 android:background="#1f000000" | 26 android:background="#1f000000" |
| 28 android:visibility="gone" /> | 27 android:visibility="gone" /> |
| 29 | 28 |
| 30 <!-- This space follows the verbose status and compliments the space that fo
llows | 29 <!-- This space follows the verbose status and compliments the space that fo
llows |
| 31 the status. --> | 30 the status. --> |
| 32 <Space android:id="@+id/location_bar_verbose_status_extra_space" | 31 <Space android:id="@+id/location_bar_verbose_status_extra_space" |
| 33 android:layout_width="8dp" | 32 android:layout_width="8dp" |
| 34 android:layout_height="match_parent" | 33 android:layout_height="match_parent" |
| 35 android:visibility="gone" /> | 34 android:visibility="gone" /> |
| 36 | 35 |
| 37 </merge> | 36 </merge> |
| OLD | NEW |