Removing LauncherProvider dependency from LauncherSettings
> This ensures that the classLoader does not need to load
LauncherProvider to access LauncherSettings
> Making a few fields public.
Change-Id: I2e8ee6e169552739f09e500d3b6acbcee7cd0718
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index d75ef73..f9f5ae1 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -69,8 +69,8 @@
static final String OLD_AUTHORITY = "com.android.launcher2.settings";
static final String AUTHORITY = ProviderConfig.AUTHORITY;
- static final String TABLE_FAVORITES = "favorites";
- static final String TABLE_WORKSPACE_SCREENS = "workspaceScreens";
+ static final String TABLE_FAVORITES = LauncherSettings.Favorites.TABLE_NAME;
+ static final String TABLE_WORKSPACE_SCREENS = LauncherSettings.WorkspaceScreens.TABLE_NAME;
static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED";
private static final String URI_PARAM_IS_EXTERNAL_ADD = "isExternalAdd";
diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java
index 111de40..90e60e4 100644
--- a/src/com/android/launcher3/LauncherSettings.java
+++ b/src/com/android/launcher3/LauncherSettings.java
@@ -19,6 +19,8 @@
import android.net.Uri;
import android.provider.BaseColumns;
+import com.android.launcher3.config.ProviderConfig;
+
/**
* Settings related utilities.
*/
@@ -45,7 +47,7 @@
* an Intent that can be launched.
* <P>Type: TEXT</P>
*/
- static final String INTENT = "intent";
+ public static final String INTENT = "intent";
/**
* The type of the gesture
@@ -104,29 +106,35 @@
*
* Tracks the order of workspace screens.
*/
- static final class WorkspaceScreens implements ChangeLogColumns {
+ public static final class WorkspaceScreens implements ChangeLogColumns {
+
+ public static final String TABLE_NAME = "workspaceScreens";
+
/**
* The content:// style URL for this table
*/
static final Uri CONTENT_URI = Uri.parse("content://" +
- LauncherProvider.AUTHORITY + "/" + LauncherProvider.TABLE_WORKSPACE_SCREENS);
+ ProviderConfig.AUTHORITY + "/" + TABLE_NAME);
/**
* The rank of this screen -- ie. how it is ordered relative to the other screens.
* <P>Type: INTEGER</P>
*/
- static final String SCREEN_RANK = "screenRank";
+ public static final String SCREEN_RANK = "screenRank";
}
/**
* Favorites.
*/
public static final class Favorites implements BaseLauncherColumns {
+
+ public static final String TABLE_NAME = "favorites";
+
/**
* The content:// style URL for this table
*/
- static final Uri CONTENT_URI = Uri.parse("content://" +
- LauncherProvider.AUTHORITY + "/" + LauncherProvider.TABLE_FAVORITES);
+ public static final Uri CONTENT_URI = Uri.parse("content://" +
+ ProviderConfig.AUTHORITY + "/" + TABLE_NAME);
/**
* The content:// style URL for a given row, identified by its id.
@@ -136,21 +144,21 @@
* @return The unique content URL for the specified row.
*/
static Uri getContentUri(long id) {
- return Uri.parse("content://" + LauncherProvider.AUTHORITY +
- "/" + LauncherProvider.TABLE_FAVORITES + "/" + id);
+ return Uri.parse("content://" + ProviderConfig.AUTHORITY +
+ "/" + TABLE_NAME + "/" + id);
}
/**
* The container holding the favorite
* <P>Type: INTEGER</P>
*/
- static final String CONTAINER = "container";
+ public static final String CONTAINER = "container";
/**
* The icon is a resource identified by a package name and an integer id.
*/
- static final int CONTAINER_DESKTOP = -100;
- static final int CONTAINER_HOTSEAT = -101;
+ public static final int CONTAINER_DESKTOP = -100;
+ public static final int CONTAINER_HOTSEAT = -101;
static final String containerToString(int container) {
switch (container) {
@@ -164,7 +172,7 @@
* The screen holding the favorite (if container is CONTAINER_DESKTOP)
* <P>Type: INTEGER</P>
*/
- static final String SCREEN = "screen";
+ public static final String SCREEN = "screen";
/**
* The X coordinate of the cell holding the favorite