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

Side by Side Diff: AndroidManifest.xml

Issue 9316018: ABP/Android Holo theme (Closed)
Patch Set: Created Feb. 1, 2013, 7:55 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | project.properties » ('j') | project.properties » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.1" > 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="7" /> 9 android:targetSdkVersion="16" />
10 10
11 <uses-permission android:name="android.permission.INTERNET" /> 11 <uses-permission android:name="android.permission.INTERNET" />
12 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 12 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
13 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> 13 <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
14 14
15 <uses-feature
16 android:name="android.hardware.touchscreen"
17 android:required="false" />
18
15 <application 19 <application
16 android:name=".AdblockPlus" 20 android:name=".AdblockPlus"
21 android:allowBackup="true"
Felix Dahlke 2013/02/01 12:11:19 How I understand it, we should set this to false.
Andrey Novikov 2013/02/02 09:58:30 Done.
17 android:icon="@drawable/ic_launcher" 22 android:icon="@drawable/ic_launcher"
18 android:label="@string/app_name" 23 android:label="@string/app_name"
19 android:theme="@style/AppTheme"> 24 android:theme="@style/Theme.Sherlock" >
20 <activity 25 <activity
21 android:name=".Preferences" 26 android:name=".Preferences"
22 android:label="@string/app_name" > 27 android:label="@string/app_name" >
23 <intent-filter> 28 <intent-filter>
24 <action android:name="android.intent.action.MAIN" /> 29 <action android:name="android.intent.action.MAIN" />
25 30
26 <category android:name="android.intent.category.LAUNCHER" /> 31 <category android:name="android.intent.category.LAUNCHER" />
27 </intent-filter> 32 </intent-filter>
28 </activity> 33 </activity>
29 <activity 34 <activity
30 android:name=".AdvancedPreferences" 35 android:name=".AdvancedPreferences"
31 android:label="@string/app_name" /> 36 android:label="@string/app_name" />
32 <activity 37 <activity
33 android:name=".ConfigurationActivity" 38 android:name=".ConfigurationActivity"
34 android:excludeFromRecents="true" 39 android:excludeFromRecents="true"
35 android:label="@string/app_name" 40 android:label="@string/app_name"
36 android:launchMode="singleInstance" 41 android:launchMode="singleInstance"
37 android:theme="@android:style/Theme.Dialog" /> 42 android:theme="@style/Theme.Sherlock.Dialog" />
38 <activity 43 <activity
39 android:name=".CrashReportDialog" 44 android:name=".CrashReportDialog"
40 android:excludeFromRecents="true" 45 android:excludeFromRecents="true"
41 android:label="@string/crash_name" 46 android:label="@string/crash_name"
42 android:launchMode="singleInstance" 47 android:launchMode="singleInstance"
43 android:theme="@android:style/Theme.Dialog" /> 48 android:theme="@style/Theme.Sherlock.Dialog" />
44 <activity 49 <activity
45 android:name=".updater.UpdaterActivity" 50 android:name=".updater.UpdaterActivity"
46 android:excludeFromRecents="true" 51 android:excludeFromRecents="true"
47 android:theme="@android:style/Theme.Translucent" /> 52 android:theme="@android:style/Theme.Translucent" />
48 53
49 <service android:name=".ProxyService" /> 54 <service android:name=".ProxyService" />
50 <service android:name=".updater.UpdaterService" /> 55 <service android:name=".updater.UpdaterService" />
51 56
52 <receiver android:name=".Starter" > 57 <receiver android:name=".Starter" >
53 <intent-filter> 58 <intent-filter>
54 <action android:name="android.intent.action.BOOT_COMPLETED" /> 59 <action android:name="android.intent.action.BOOT_COMPLETED" />
55 </intent-filter> 60 </intent-filter>
56 <intent-filter> 61 <intent-filter>
57 <action android:name="android.intent.action.PACKAGE_REPLACED" /> 62 <action android:name="android.intent.action.PACKAGE_REPLACED" />
58 63
59 <data android:scheme="package" /> 64 <data android:scheme="package" />
60 </intent-filter> 65 </intent-filter>
61 </receiver> 66 </receiver>
62 <receiver android:name=".updater.AlarmReceiver" /> 67 <receiver android:name=".updater.AlarmReceiver" />
63 </application> 68 </application>
64 69
65 </manifest> 70 </manifest>
OLDNEW
« no previous file with comments | « no previous file | project.properties » ('j') | project.properties » ('J')

Powered by Google App Engine
This is Rietveld