diff options
| -rw-r--r-- | AndroidManifest.xml | 30 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/InstallShortcutReceiver.java | 2 | ||||
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/UninstallShortcutReceiver.java | 2 |
3 files changed, 17 insertions, 17 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 54c4e6a55..e08140dd6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -25,29 +25,29 @@ <original-package android:name="com.android.launcher2" /> <permission - android:name="com.cyanogenmod.trebuchet.permission.PRELOAD_WORKSPACE" + android:name="com.android.launcher.permission.PRELOAD_WORKSPACE" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="system|signature" /> <permission - android:name="com.cyanogenmod.trebuchet.permission.INSTALL_SHORTCUT" + android:name="com.android.launcher.permission.INSTALL_SHORTCUT" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="normal" android:label="@string/permlab_install_shortcut" android:description="@string/permdesc_install_shortcut" /> <permission - android:name="com.cyanogenmod.trebuchet.permission.UNINSTALL_SHORTCUT" + android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="normal" android:label="@string/permlab_uninstall_shortcut" android:description="@string/permdesc_uninstall_shortcut"/> <permission - android:name="com.cyanogenmod.trebuchet.permission.READ_SETTINGS" + android:name="com.android.launcher.permission.READ_SETTINGS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="normal" android:label="@string/permlab_read_settings" android:description="@string/permdesc_read_settings"/> <permission - android:name="com.cyanogenmod.trebuchet.permission.WRITE_SETTINGS" + android:name="com.android.launcher.permission.WRITE_SETTINGS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="normal" android:label="@string/permlab_write_settings" @@ -59,8 +59,8 @@ <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.BIND_APPWIDGET" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> - <uses-permission android:name="com.cyanogenmod.trebuchet.permission.READ_SETTINGS" /> - <uses-permission android:name="com.cyanogenmod.trebuchet.permission.WRITE_SETTINGS" /> + <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" /> + <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" /> <application android:name="com.cyanogenmod.trebuchet.LauncherApplication" @@ -111,9 +111,9 @@ <!-- Intent received used to prepopulate the default workspace. --> <receiver android:name="com.cyanogenmod.trebuchet.PreloadReceiver" - android:permission="com.cyanogenmod.trebuchet.permission.PRELOAD_WORKSPACE"> + android:permission="com.android.launcher.permission.PRELOAD_WORKSPACE"> <intent-filter> - <action android:name="com.cyanogenmod.trebuchet.action.PRELOAD_WORKSPACE" /> + <action android:name="com.android.launcher.action.PRELOAD_WORKSPACE" /> </intent-filter> </receiver> @@ -127,18 +127,18 @@ <!-- Intent received used to install shortcuts from other applications --> <receiver android:name="com.cyanogenmod.trebuchet.InstallShortcutReceiver" - android:permission="com.cyanogenmod.trebuchet.permission.INSTALL_SHORTCUT"> + android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"> <intent-filter> - <action android:name="com.cyanogenmod.trebuchet.action.INSTALL_SHORTCUT" /> + <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" /> </intent-filter> </receiver> <!-- Intent received used to uninstall shortcuts from other applications --> <receiver android:name="com.cyanogenmod.trebuchet.UninstallShortcutReceiver" - android:permission="com.cyanogenmod.trebuchet.permission.UNINSTALL_SHORTCUT"> + android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT"> <intent-filter> - <action android:name="com.cyanogenmod.trebuchet.action.UNINSTALL_SHORTCUT" /> + <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" /> </intent-filter> </receiver> @@ -146,8 +146,8 @@ <provider android:name="com.cyanogenmod.trebuchet.LauncherProvider" android:authorities="com.cyanogenmod.trebuchet.settings" - android:writePermission="com.cyanogenmod.trebuchet.permission.WRITE_SETTINGS" - android:readPermission="com.cyanogenmod.trebuchet.permission.READ_SETTINGS" /> + android:writePermission="com.android.launcher.permission.WRITE_SETTINGS" + android:readPermission="com.android.launcher.permission.READ_SETTINGS" /> <meta-data android:name="android.nfc.disable_beam_default" android:value="true" /> diff --git a/src/com/cyanogenmod/trebuchet/InstallShortcutReceiver.java b/src/com/cyanogenmod/trebuchet/InstallShortcutReceiver.java index d67d6abcd..7cca81fbb 100644 --- a/src/com/cyanogenmod/trebuchet/InstallShortcutReceiver.java +++ b/src/com/cyanogenmod/trebuchet/InstallShortcutReceiver.java @@ -34,7 +34,7 @@ import java.util.Set; public class InstallShortcutReceiver extends BroadcastReceiver { public static final String ACTION_INSTALL_SHORTCUT = - "com.cyanogenmod.trebuchet.action.INSTALL_SHORTCUT"; + "com.android.launcher.action.INSTALL_SHORTCUT"; public static final String NEW_APPS_PAGE_KEY = "apps.new.page"; public static final String NEW_APPS_LIST_KEY = "apps.new.list"; diff --git a/src/com/cyanogenmod/trebuchet/UninstallShortcutReceiver.java b/src/com/cyanogenmod/trebuchet/UninstallShortcutReceiver.java index 77959d084..6f4f0307b 100644 --- a/src/com/cyanogenmod/trebuchet/UninstallShortcutReceiver.java +++ b/src/com/cyanogenmod/trebuchet/UninstallShortcutReceiver.java @@ -35,7 +35,7 @@ import java.util.Set; public class UninstallShortcutReceiver extends BroadcastReceiver { private static final String ACTION_UNINSTALL_SHORTCUT = - "com.cyanogenmod.trebuchet.action.UNINSTALL_SHORTCUT"; + "com.android.launcher.action.UNINSTALL_SHORTCUT"; // The set of shortcuts that are pending uninstall private static ArrayList<PendingUninstallShortcutInfo> mUninstallQueue = |