OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- This Source Code Form is subject to the terms of the Mozilla Public | 2 <!-- This Source Code Form is subject to the terms of the Mozilla Public |
3 - License, v. 2.0. If a copy of the MPL was not distributed with this | 3 - License, v. 2.0. If a copy of the MPL was not distributed with this |
4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | 4 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
5 | 5 |
6 <merge xmlns:android="http://schemas.android.com/apk/res/android" | 6 <merge xmlns:android="http://schemas.android.com/apk/res/android" |
7 xmlns:gecko="http://schemas.android.com/apk/res-auto" | 7 xmlns:gecko="http://schemas.android.com/apk/res-auto" |
8 xmlns:tools="http://schemas.android.com/tools" | 8 xmlns:tools="http://schemas.android.com/tools" |
9 tools:layout_height="match_parent" | 9 tools:layout_height="match_parent" |
10 tools:layout_width="match_parent" | 10 tools:layout_width="match_parent" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 style="@style/TextAppearance.PrivateTab.Description" | 47 style="@style/TextAppearance.PrivateTab.Description" |
48 android:layout_width="wrap_content" | 48 android:layout_width="wrap_content" |
49 android:layout_height="wrap_content" | 49 android:layout_height="wrap_content" |
50 android:layout_gravity="center_horizontal" | 50 android:layout_gravity="center_horizontal" |
51 android:layout_marginBottom="36dp" | 51 android:layout_marginBottom="36dp" |
52 android:gravity="center_horizontal" | 52 android:gravity="center_horizontal" |
53 android:lineSpacingMultiplier="1.3" | 53 android:lineSpacingMultiplier="1.3" |
54 android:text="@string/private_tab_panel_description2" | 54 android:text="@string/private_tab_panel_description2" |
55 android:textColor="@color/photon_text_secondary"/> | 55 android:textColor="@color/photon_text_secondary"/> |
56 | 56 |
| 57 <!-- We always hide the learn more link |
| 58 See https://issues.adblockplus.org/ticket/7214 --> |
57 <TextView | 59 <TextView |
58 style="@style/TextAppearance.PrivateTab.Description" | 60 style="@style/TextAppearance.PrivateTab.Description" |
59 android:id="@+id/learn_more_link" | 61 android:id="@+id/learn_more_link" |
60 android:layout_width="wrap_content" | 62 android:layout_width="wrap_content" |
61 android:layout_height="wrap_content" | 63 android:layout_height="wrap_content" |
62 android:layout_gravity="center_horizontal" | 64 android:layout_gravity="center_horizontal" |
63 android:clickable="true" | 65 android:clickable="true" |
64 android:text="@string/private_tab_learn_more" | 66 android:text="@string/private_tab_learn_more" |
| 67 android:visibility="gone" |
65 android:textColor="@color/link_blue"/> | 68 android:textColor="@color/link_blue"/> |
66 | 69 |
67 </LinearLayout> | 70 </LinearLayout> |
68 | 71 |
69 </ScrollView> | 72 </ScrollView> |
70 | 73 |
71 <!-- Note: for an unknown reason, scrolling in the TabsLayout | 74 <!-- Note: for an unknown reason, scrolling in the TabsLayout |
72 does not work unless it is laid out after the empty view. --> | 75 does not work unless it is laid out after the empty view. --> |
73 <view | 76 <view |
74 android:id="@+id/private_tabs_layout" | 77 android:id="@+id/private_tabs_layout" |
75 style="@style/TabsLayout" | 78 style="@style/TabsLayout" |
76 class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout" | 79 class="org.mozilla.gecko.tabs.TabsPanel$TabsLayout" |
77 android:layout_width="match_parent" | 80 android:layout_width="match_parent" |
78 android:layout_height="match_parent" | 81 android:layout_height="match_parent" |
79 android:visibility="gone" | 82 android:visibility="gone" |
80 gecko:tabs="tabs_private"/> | 83 gecko:tabs="tabs_private"/> |
81 | 84 |
82 </merge> | 85 </merge> |
OLD | NEW |