diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2014-11-10 10:35:02 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:59 -0800 |
| commit | 916ba22867bbbe05edc6ccc39622f0e569b00d58 (patch) | |
| tree | acb15d42e2ccf86f7d7f03e3dcaec1607ed899a0 /AndroidManifest.xml | |
| parent | 12ed20fe5260a7a3b7bedce4cf5e995fc1ac281a (diff) | |
| download | android_packages_apps_Trebuchet-916ba22867bbbe05edc6ccc39622f0e569b00d58.tar.gz android_packages_apps_Trebuchet-916ba22867bbbe05edc6ccc39622f0e569b00d58.tar.bz2 android_packages_apps_Trebuchet-916ba22867bbbe05edc6ccc39622f0e569b00d58.zip | |
Fix L2 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.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 12888962f..4965c0c8e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,8 +19,13 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.launcher3"> - <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="16"/> + package="com.android.launcher3" + android:versionName="@string/application_version" + android:versionCode="1000"> + + <original-package android:name="com.android.launcher3" /> + + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="16" /> <permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" @@ -54,9 +59,6 @@ android:name="com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST" android:protectionLevel="signatureOrSystem" /> - <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" /> |