Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: libadblockplus-android-webviewapp/res/layout/activity_main.xml

Issue 29351744: Issue 4399 - Add WebView inheritor with ad blocking (Closed)
Left Patch Set: yet another improvement - working with null urls (for local files) Created Sept. 22, 2016, 8:08 a.m.
Right Patch Set: changed packages, now using AdblockEngine (original ABPEngine), improved demo app Created Oct. 25, 2016, 11:20 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <LinearLayout 3 <LinearLayout
4 xmlns:android="http://schemas.android.com/apk/res/android" 4 xmlns:android="http://schemas.android.com/apk/res/android"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 android:orientation="vertical"> 7 android:orientation="vertical">
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
12 android:orientation="horizontal"> 12 android:orientation="horizontal">
13 13
14 <EditText 14 <EditText
15 android:id="@+id/main_url" 15 android:id="@+id/main_url"
16 android:layout_width="0px" 16 android:layout_width="0px"
17 android:layout_weight="1" 17 android:layout_weight="1"
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 android:text="http://worddictionary.co.uk" 19 android:text="http://www.google.com"
20 android:singleLine="true"/> 20 android:singleLine="true"/>
21 21
22 <Button 22 <Button
23 android:id="@+id/main_ok" 23 android:id="@+id/main_ok"
24 android:layout_width="50dp"
25 android:layout_height="wrap_content"
26 android:text="@string/main_ok"/>
27
28 <Button
29 android:id="@+id/main_back"
30 android:layout_width="40dp"
31 android:layout_height="wrap_content"
32 android:text="@string/main_prev"/>
33
34 <Button
35 android:id="@+id/main_forward"
36 android:layout_width="40dp"
37 android:layout_height="wrap_content"
38 android:text="@string/main_next"/>
39
40 </LinearLayout>
41
42 <LinearLayout
43 android:layout_width="match_parent"
44 android:layout_height="wrap_content">
45
46 <CheckBox
47 android:id="@+id/main_abp_enabled"
24 android:layout_width="wrap_content" 48 android:layout_width="wrap_content"
25 android:layout_height="wrap_content" 49 android:layout_height="wrap_content"
26 android:text="@string/main_ok"/> 50 android:checked="true"
51 android:text="@string/main_abp"/>
52
53 <CheckBox
54 android:id="@+id/main_aa_enabled"
55 android:layout_width="wrap_content"
56 android:layout_height="wrap_content"
57 android:text="@string/main_aa"/>
27 58
28 </LinearLayout> 59 </LinearLayout>
29 60
30 <ProgressBar 61 <ProgressBar
31 android:id="@+id/main_progress" 62 android:id="@+id/main_progress"
32 android:layout_width="match_parent" 63 android:layout_width="match_parent"
33 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
34 style="?android:attr/progressBarStyleHorizontal" 65 style="?android:attr/progressBarStyleHorizontal"
35 android:indeterminate="false" 66 android:indeterminate="false"
36 android:indeterminateOnly="false" 67 android:indeterminateOnly="false"
37 android:max="100"/> 68 android:max="100"/>
38 69
39 <org.adblockplus.android.AdblockWebView 70 <org.adblockplus.libadblockplus.android.webview.AdblockWebView
40 android:id="@+id/main_webview" 71 android:id="@+id/main_webview"
41 android:layout_width="match_parent" 72 android:layout_width="match_parent"
42 android:layout_height="match_parent"/> 73 android:layout_height="match_parent"/>
43 74
44 </LinearLayout> 75 </LinearLayout>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld