From dda298f30af6a957b9194f54d91a3e6bbaa68302 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Sat, 1 Feb 2014 03:42:36 +0000
Subject: 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
---
 AndroidManifest.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'AndroidManifest.xml')

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" />
-- 
cgit v1.2.3