Side by Side Diff: mobile/android/base/resources/layout/abb_start_pane_step_2.xml
Issue 29570589:
Noissue - Adjustments related to copyright text (Closed)
Patch Set:
Created Oct. 9, 2017, 2:51 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« mobile/android/base/resources/drawable/abb_start_pane_button.xml ('K')
|
« mobile/android/base/resources/layout/abb_start_pane_step_1.xml ('k')
|
mobile/android/base/resources/layout/abb_start_pane_step_3.xml » ('j')
|
translations.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- | |
| 3 - This file is part of the Adblock Plus <https://adblockplus.org/>, | |
| 4 - Copyright (C) 2006-present eyeo GmbH | |
| 5 - | |
| 6 - Adblock Plus is free software: you can redistribute it and/or modify | |
| 7 - it under the terms of the GNU General Public License version 3 as | |
| 8 - published by the Free Software Foundation. | |
| 9 - | |
| 10 - Adblock Plus is distributed in the hope that it will be useful, | |
| 11 - but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 - GNU General Public License for more details. | |
| 14 - | |
| 15 - You should have received a copy of the GNU General Public License | |
| 16 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | |
| 17 --> | |
| 18 | |
| 2 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | 19 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 android:layout_width="match_parent" | 20 android:layout_width="match_parent" |
| 4 android:layout_height="wrap_content"> | 21 android:layout_height="wrap_content"> |
| 5 <LinearLayout android:layout_width="match_parent" | 22 <LinearLayout android:layout_width="match_parent" |
| 6 android:layout_height="wrap_content" | 23 android:layout_height="wrap_content" |
| 7 android:orientation="vertical" | 24 android:orientation="vertical" |
| 8 android:background="#ffffff" > | 25 android:background="#ffffff" > |
| 9 <TextView android:layout_width="match_parent" | 26 <TextView android:layout_width="match_parent" |
| 10 android:layout_height="wrap_content" | 27 android:layout_height="wrap_content" |
| 11 android:tag="ttf_opensans_light" | 28 android:tag="ttf_opensans_light" |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 37 android:src="@drawable/abb_frp_img_2" /> | 54 android:src="@drawable/abb_frp_img_2" /> |
| 38 <TextView android:layout_width="match_parent" | 55 <TextView android:layout_width="match_parent" |
| 39 android:layout_height="wrap_content" | 56 android:layout_height="wrap_content" |
| 40 android:tag="ttf_opensans_semibold" | 57 android:tag="ttf_opensans_semibold" |
| 41 android:textColor="#353435" | 58 android:textColor="#353435" |
| 42 android:textSize="12sp" | 59 android:textSize="12sp" |
| 43 android:text="@string/abb_frp_step_2_text_learn" /> | 60 android:text="@string/abb_frp_step_2_text_learn" /> |
| 44 </LinearLayout> | 61 </LinearLayout> |
| 45 </ScrollView> | 62 </ScrollView> |
| 46 | 63 |
| OLD | NEW |
