diff options
| -rw-r--r-- | AndroidManifest.xml | 15 | ||||
| -rw-r--r-- | src/com/android/launcher2/LauncherProvider.java | 8 |
2 files changed, 7 insertions, 16 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ffedec7f1..13682367b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -19,8 +19,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.launcher2" - > + package="com.android.launcher"> <original-package android:name="com.android.launcher2" /> @@ -62,12 +61,12 @@ <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" /> <application - android:name="LauncherApplication" + android:name="com.android.launcher2.LauncherApplication" android:label="@string/application_name" android:icon="@drawable/ic_launcher_home"> <activity - android:name="Launcher" + android:name="com.android.launcher2.Launcher" android:launchMode="singleTask" android:clearTaskOnLaunch="true" android:stateNotNeeded="true" @@ -83,7 +82,7 @@ </activity> <activity - android:name="WallpaperChooser" + android:name="com.android.launcher2.WallpaperChooser" android:label="@string/pick_wallpaper" android:icon="@drawable/ic_launcher_wallpaper" android:screenOrientation="nosensor" @@ -96,7 +95,7 @@ <!-- Intent received used to install shortcuts from other applications --> <receiver - android:name=".InstallShortcutReceiver" + android:name="com.android.launcher2.InstallShortcutReceiver" android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"> <intent-filter> <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" /> @@ -105,7 +104,7 @@ <!-- Intent received used to uninstall shortcuts from other applications --> <receiver - android:name=".UninstallShortcutReceiver" + android:name="com.android.launcher2.UninstallShortcutReceiver" android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT"> <intent-filter> <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" /> @@ -114,7 +113,7 @@ <!-- The settings provider contains Home's data, like the workspace favorites --> <provider - android:name="LauncherProvider" + android:name="com.android.launcher2.LauncherProvider" android:authorities="com.android.launcher2.settings" android:writePermission="com.android.launcher.permission.WRITE_SETTINGS" android:readPermission="com.android.launcher.permission.READ_SETTINGS" /> diff --git a/src/com/android/launcher2/LauncherProvider.java b/src/com/android/launcher2/LauncherProvider.java index 14c83b3e3..e262be385 100644 --- a/src/com/android/launcher2/LauncherProvider.java +++ b/src/com/android/launcher2/LauncherProvider.java @@ -45,12 +45,10 @@ import android.util.Xml; import android.util.AttributeSet; import android.net.Uri; import android.text.TextUtils; -import android.os.*; import android.provider.Settings; import java.io.IOException; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.List; import org.xmlpull.v1.XmlPullParserException; @@ -69,9 +67,6 @@ public class LauncherProvider extends ContentProvider { static final String AUTHORITY = "com.android.launcher2.settings"; - static final String EXTRA_BIND_SOURCES = "com.android.launcher2.settings.bindsources"; - static final String EXTRA_BIND_TARGETS = "com.android.launcher2.settings.bindtargets"; - static final String TABLE_FAVORITES = "favorites"; static final String PARAMETER_NOTIFY = "notify"; @@ -485,8 +480,6 @@ public class LauncherProvider extends ContentProvider { Cursor c = null; try { boolean logged = false; - final ContentValues values = new ContentValues(); - final ContentResolver cr = mContext.getContentResolver(); final SQLiteStatement update = db.compileStatement("UPDATE favorites " + "SET icon=? WHERE _id=?"); @@ -587,7 +580,6 @@ public class LauncherProvider extends ContentProvider { String updateWhere = Favorites._ID + "=" + favoriteId; db.update(TABLE_FAVORITES, values, updateWhere, null); - ComponentName cn = null; if (favoriteType == Favorites.ITEM_TYPE_WIDGET_CLOCK) { appWidgetManager.bindAppWidgetId(appWidgetId, new ComponentName("com.android.alarmclock", |