Side by Side Diff: AndroidManifest.xml
Issue 9433002:
ABP/Android Proxy settings user helper (Closed)
Patch Set:
Created Feb. 20, 2013, 8:49 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
res/layout/configuration.xml » ('j')
|
res/layout/proxyconfiguration.xml » ('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 <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 package="org.adblockplus.android" | 3 package="org.adblockplus.android" |
| 4 android:versionCode="168" | 4 android:versionCode="168" |
| 5 android:versionName="1.0.2a" > | 5 android:versionName="1.0.2a" > |
| 6 | 6 |
| 7 <uses-sdk | 7 <uses-sdk |
| 8 android:minSdkVersion="7" | 8 android:minSdkVersion="7" |
| 9 android:targetSdkVersion="16" /> | 9 android:targetSdkVersion="16" /> |
| 10 | 10 |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 34 <activity | 34 <activity |
| 35 android:name=".AdvancedPreferences" | 35 android:name=".AdvancedPreferences" |
| 36 android:label="@string/app_name" /> | 36 android:label="@string/app_name" /> |
| 37 <activity | 37 <activity |
| 38 android:name=".ConfigurationActivity" | 38 android:name=".ConfigurationActivity" |
| 39 android:excludeFromRecents="true" | 39 android:excludeFromRecents="true" |
| 40 android:label="@string/app_name" | 40 android:label="@string/app_name" |
| 41 android:launchMode="singleInstance" | 41 android:launchMode="singleInstance" |
| 42 android:theme="@style/Theme.Sherlock.Dialog" /> | 42 android:theme="@style/Theme.Sherlock.Dialog" /> |
| 43 <activity | 43 <activity |
| 44 android:name=".ProxyConfigurationActivity" | |
| 45 android:excludeFromRecents="true" | |
| 46 android:label="@string/proxysettings_name" | |
| 47 android:launchMode="singleInstance" | |
| 48 android:theme="@style/Theme.Sherlock.Dialog" /> | |
| 49 <activity | |
| 44 android:name=".CrashReportDialog" | 50 android:name=".CrashReportDialog" |
| 45 android:excludeFromRecents="true" | 51 android:excludeFromRecents="true" |
| 46 android:label="@string/crash_name" | 52 android:label="@string/crash_name" |
| 47 android:launchMode="singleInstance" | 53 android:launchMode="singleInstance" |
| 48 android:theme="@style/Theme.Sherlock.Dialog" /> | 54 android:theme="@style/Theme.Sherlock.Dialog" /> |
| 49 <activity | 55 <activity |
| 50 android:name=".updater.UpdaterActivity" | 56 android:name=".updater.UpdaterActivity" |
| 51 android:excludeFromRecents="true" | 57 android:excludeFromRecents="true" |
| 52 android:theme="@android:style/Theme.Translucent" /> | 58 android:theme="@android:style/Theme.Translucent" /> |
| 53 | 59 |
| 54 <service android:name=".ProxyService" /> | 60 <service android:name=".ProxyService" /> |
| 55 <service android:name=".updater.UpdaterService" /> | 61 <service android:name=".updater.UpdaterService" /> |
| 56 | 62 |
| 57 <receiver android:name=".Starter" > | 63 <receiver android:name=".Starter" > |
| 58 <intent-filter> | 64 <intent-filter> |
| 59 <action android:name="android.intent.action.BOOT_COMPLETED" /> | 65 <action android:name="android.intent.action.BOOT_COMPLETED" /> |
| 60 </intent-filter> | 66 </intent-filter> |
| 61 <intent-filter> | 67 <intent-filter> |
| 62 <action android:name="android.intent.action.PACKAGE_REPLACED" /> | 68 <action android:name="android.intent.action.PACKAGE_REPLACED" /> |
| 63 | 69 |
| 64 <data android:scheme="package" /> | 70 <data android:scheme="package" /> |
| 65 </intent-filter> | 71 </intent-filter> |
| 66 </receiver> | 72 </receiver> |
| 67 <receiver android:name=".updater.AlarmReceiver" /> | 73 <receiver android:name=".updater.AlarmReceiver" /> |
| 68 </application> | 74 </application> |
| 69 | 75 |
| 70 </manifest> | 76 </manifest> |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
res/layout/configuration.xml » ('j')
|
res/layout/proxyconfiguration.xml » ('J')
