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: minor codestyle fixes Created Oct. 20, 2016, 1:16 p.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"
(...skipping 21 matching lines...) Expand all
32 android:text="@string/main_prev"/> 32 android:text="@string/main_prev"/>
33 33
34 <Button 34 <Button
35 android:id="@+id/main_forward" 35 android:id="@+id/main_forward"
36 android:layout_width="40dp" 36 android:layout_width="40dp"
37 android:layout_height="wrap_content" 37 android:layout_height="wrap_content"
38 android:text="@string/main_next"/> 38 android:text="@string/main_next"/>
39 39
40 </LinearLayout> 40 </LinearLayout>
41 41
42 <CheckBox 42 <LinearLayout
43 android:id="@+id/main_aa" 43 android:layout_width="match_parent"
44 android:layout_width="wrap_content" 44 android:layout_height="wrap_content">
45 android:layout_height="wrap_content" 45
46 android:text="@string/main_aa"/> 46 <CheckBox
47 android:id="@+id/main_abp_enabled"
48 android:layout_width="wrap_content"
49 android:layout_height="wrap_content"
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"/>
58
59 </LinearLayout>
47 60
48 <ProgressBar 61 <ProgressBar
49 android:id="@+id/main_progress" 62 android:id="@+id/main_progress"
50 android:layout_width="match_parent" 63 android:layout_width="match_parent"
51 android:layout_height="wrap_content" 64 android:layout_height="wrap_content"
52 style="?android:attr/progressBarStyleHorizontal" 65 style="?android:attr/progressBarStyleHorizontal"
53 android:indeterminate="false" 66 android:indeterminate="false"
54 android:indeterminateOnly="false" 67 android:indeterminateOnly="false"
55 android:max="100"/> 68 android:max="100"/>
56 69
57 <org.adblockplus.android.AdblockWebView 70 <org.adblockplus.libadblockplus.android.webview.AdblockWebView
58 android:id="@+id/main_webview" 71 android:id="@+id/main_webview"
59 android:layout_width="match_parent" 72 android:layout_width="match_parent"
60 android:layout_height="match_parent"/> 73 android:layout_height="match_parent"/>
61 74
62 </LinearLayout> 75 </LinearLayout>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld