summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-02-01 03:42:36 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2014-02-01 04:50:20 +0000
commitdda298f30af6a957b9194f54d91a3e6bbaa68302 (patch)
treec6a8b84b2fb9ff84cace607d0c5be67a7a076fa0 /AndroidManifest.xml
parent5fbcf7f7fabddfd55d959de5278ca635f66c536b (diff)
downloadandroid_packages_apps_Trebuchet-dda298f30af6a957b9194f54d91a3e6bbaa68302.tar.gz
android_packages_apps_Trebuchet-dda298f30af6a957b9194f54d91a3e6bbaa68302.tar.bz2
android_packages_apps_Trebuchet-dda298f30af6a957b9194f54d91a3e6bbaa68302.zip
Fix L3 and old Trebuchet migration
There can only be one original-package tag. Go with com.android.launcher3 for now, and move Trebuchet back to com.cyanogenmod.trebuchet. This will allow for workspace migrations from both CM10.2 Trebuchet and from CM11 Launcher3 Change-Id: I7743954bffc55f503851038f800607947e20015e
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9e192544a..13cf636fc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,8 @@
android:versionName="@string/application_version"
android:versionCode="1000">
+ <original-package android:name="com.android.launcher3" />
+
<uses-sdk android:minSdkVersion="17" android:targetSdkVersion="19" />
<permission
@@ -47,9 +49,6 @@
android:protectionLevel="signature"
/>
- <original-package android:name="com.cyanogenmod.trebuchet" />
- <original-package android:name="com.android.launcher3" />
-
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.SET_WALLPAPER" />
<uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />