Delta Between Two Patch Sets: sitescripts/extensions/test/data/diff/adblockplusandroid.diff
Issue 29361729:
Issue 4574 - Adds Tests to createNightlies platform specific revisions (Closed)
Left Patch Set:
Created Nov. 11, 2016, 10:30 a.m.
Right Patch Set: add bookmark files so that all repos have master bookmark, add white space below license
Created Nov. 25, 2016, 10:15 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« sitescripts/extensions/test/data/diff/adblockplus.diff ('k')
|
sitescripts/extensions/test/data/diff/adblockpluschrome.diff » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 # HG changeset patch | |
| 2 # User Jon Sonesen <jon@adblockplus.org> | |
| 3 # Date 1478778800 -3600 | |
| 4 # Thu Nov 10 12:53:20 2016 +0100 | |
| 5 # Node ID 8b06474b8c49a44a046e074287638a542bd7fb0a | |
| 6 # Parent 0000000000000000000000000000000000000000 | |
| 7 1 | |
| 8 | |
| 9 diff --git a/AndroidManifest.xml b/AndroidManifest.xml | |
| 10 new file mode 100644 | |
| 11 --- /dev/null | |
| 12 +++ b/AndroidManifest.xml | |
| 13 @@ -0,0 +1,77 @@ | |
| 14 +<?xml version="1.0" encoding="utf-8"?> | |
| 15 +<manifest xmlns:android="http://schemas.android.com/apk/res/android" | |
| 16 + package="org.adblockplus.android" | |
| 17 + android:versionCode="359" | |
| 18 + android:versionName="1.3" > | |
| 19 + | |
| 20 + <uses-sdk | |
| 21 + android:minSdkVersion="7" | |
| 22 + android:targetSdkVersion="16" /> | |
| 23 + | |
| 24 + <uses-permission android:name="android.permission.INTERNET" /> | |
| 25 + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | |
| 26 + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" / > | |
| 27 + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" / > | |
| 28 + <uses-permission android:name="android.permission.ACCESS_SUPERUSER" /> | |
| 29 + | |
| 30 + <uses-feature | |
| 31 + android:name="android.hardware.touchscreen" | |
| 32 + android:required="false" /> | |
| 33 + | |
| 34 + <application | |
| 35 + android:name=".AdblockPlus" | |
| 36 + android:allowBackup="true" | |
| 37 + android:icon="@drawable/ic_launcher" | |
| 38 + android:label="@string/app_name" | |
| 39 + android:theme="@style/AppTheme" > | |
| 40 + <activity | |
| 41 + android:name=".Preferences" | |
| 42 + android:label="@string/app_name" > | |
| 43 + <intent-filter> | |
| 44 + <action android:name="android.intent.action.MAIN" /> | |
| 45 + | |
| 46 + <category android:name="android.intent.category.LAUNCHER" /> | |
| 47 + </intent-filter> | |
| 48 + </activity> | |
| 49 + <activity | |
| 50 + android:name=".AdvancedPreferences" | |
| 51 + android:label="@string/app_name" /> | |
| 52 + <activity | |
| 53 + android:name=".ConfigurationActivity" | |
| 54 + android:excludeFromRecents="true" | |
| 55 + android:label="@string/app_name" | |
| 56 + android:launchMode="singleInstance" | |
| 57 + android:theme="@style/Theme.Sherlock.Dialog" /> | |
| 58 + <activity | |
| 59 + android:name=".ProxyConfigurationActivity" | |
| 60 + android:excludeFromRecents="true" | |
| 61 + android:label="@string/proxysettings_name" | |
| 62 + android:launchMode="singleInstance" | |
| 63 + android:theme="@style/Theme.Sherlock.Dialog" /> | |
| 64 + <activity | |
| 65 + android:name=".CrashReportDialog" | |
| 66 + android:excludeFromRecents="true" | |
| 67 + android:label="@string/crash_name" | |
| 68 + android:launchMode="singleInstance" | |
| 69 + android:theme="@style/Theme.Sherlock.Dialog" /> | |
| 70 + <activity | |
| 71 + android:name=".updater.UpdaterActivity" | |
| 72 + android:excludeFromRecents="true" | |
| 73 + android:theme="@android:style/Theme.Translucent" /> | |
| 74 + | |
| 75 + <service android:name=".ProxyService" /> | |
| 76 + <service android:name=".updater.UpdaterService" /> | |
| 77 + | |
| 78 + <receiver android:name=".Starter" > | |
| 79 + <intent-filter> | |
| 80 + <action android:name="android.intent.action.BOOT_COMPLETED" /> | |
| 81 + </intent-filter> | |
| 82 + <intent-filter> | |
| 83 + <action android:name="android.intent.action.PACKAGE_REPLACED" / > | |
| 84 + | |
| 85 + <data android:scheme="package" /> | |
| 86 + </intent-filter> | |
| 87 + </receiver> | |
| 88 + </application> | |
| 89 + | |
| 90 +</manifest> | |
| 91 # HG changeset patch | |
| 92 # User Jon Sonesen <jon@adblockplus.org> | |
| 93 # Date 1478778801 -3600 | |
| 94 # Thu Nov 10 12:53:21 2016 +0100 | |
| 95 # Node ID 8fb81b98936198017879b608452d755fce1a436c | |
| 96 # Parent 8b06474b8c49a44a046e074287638a542bd7fb0a | |
| 97 Added tag 1.3 for changeset 8b06474b8c49 | |
| 98 | |
| 99 diff --git a/.hgtags b/.hgtags | |
| 100 new file mode 100644 | |
| 101 --- /dev/null | |
| 102 +++ b/.hgtags | |
| 103 @@ -0,0 +1,1 @@ | |
| 104 +8b06474b8c49a44a046e074287638a542bd7fb0a 1.3 | |
| LEFT | RIGHT |
« sitescripts/extensions/test/data/diff/adblockplus.diff ('k')
|
sitescripts/extensions/test/data/diff/adblockpluschrome.diff » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
