diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-04-20 21:26:15 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-04-21 08:14:19 -0700 |
commit | cc8f9e0af7f9acc6f03a1a0173d3e118b4e96ae5 (patch) | |
tree | f460360dc05d2e062ebb03af4373de04eaa4cb4d /src/com/android | |
parent | 77c263660ef0f1041e627df0f415743f30dcf075 (diff) | |
download | android_packages_apps_Trebuchet-cc8f9e0af7f9acc6f03a1a0173d3e118b4e96ae5.tar.gz android_packages_apps_Trebuchet-cc8f9e0af7f9acc6f03a1a0173d3e118b4e96ae5.tar.bz2 android_packages_apps_Trebuchet-cc8f9e0af7f9acc6f03a1a0173d3e118b4e96ae5.zip |
Removing some deprecated columns.
Removing these columns will ensure that new installs do not
get this column, without affecting the upgrades.
Change-Id: If06edcd2f899f30b5427c07e72a170ccefc32dd6
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherSettings.java | 55 |
2 files changed, 0 insertions, 58 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index f07609480..a62d1e72e 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -658,13 +658,10 @@ public class LauncherProvider extends ContentProvider { "spanY INTEGER," + "itemType INTEGER," + "appWidgetId INTEGER NOT NULL DEFAULT -1," + - "isShortcut INTEGER," + "iconType INTEGER," + "iconPackage TEXT," + "iconResource TEXT," + "icon BLOB," + - "uri TEXT," + - "displayMode INTEGER," + "appWidgetProvider TEXT," + "modified INTEGER NOT NULL DEFAULT 0," + "restored INTEGER NOT NULL DEFAULT 0," + diff --git a/src/com/android/launcher3/LauncherSettings.java b/src/com/android/launcher3/LauncherSettings.java index 0c1628774..0e559a544 100644 --- a/src/com/android/launcher3/LauncherSettings.java +++ b/src/com/android/launcher3/LauncherSettings.java @@ -216,16 +216,6 @@ public class LauncherSettings { public static final int ITEM_TYPE_FOLDER = 2; /** - * The favorite is a live folder - * - * Note: live folders can no longer be added to Launcher, and any live folders which - * exist within the launcher database will be ignored when loading. That said, these - * entries in the database may still exist, and are not automatically stripped. - */ - @Deprecated - static final int ITEM_TYPE_LIVE_FOLDER = 3; - - /** * The favorite is a widget */ public static final int ITEM_TYPE_APPWIDGET = 4; @@ -236,24 +226,6 @@ public class LauncherSettings { public static final int ITEM_TYPE_CUSTOM_APPWIDGET = 5; /** - * The favorite is a clock - */ - @Deprecated - static final int ITEM_TYPE_WIDGET_CLOCK = 1000; - - /** - * The favorite is a search widget - */ - @Deprecated - static final int ITEM_TYPE_WIDGET_SEARCH = 1001; - - /** - * The favorite is a photo frame - */ - @Deprecated - static final int ITEM_TYPE_WIDGET_PHOTO_FRAME = 1002; - - /** * The appWidgetId of the widget * * <P>Type: INTEGER</P> @@ -266,33 +238,6 @@ public class LauncherSettings { * <P>Type: STRING</P> */ public static final String APPWIDGET_PROVIDER = "appWidgetProvider"; - - /** - * Indicates whether this favorite is an application-created shortcut or not. - * If the value is 0, the favorite is not an application-created shortcut, if the - * value is 1, it is an application-created shortcut. - * <P>Type: INTEGER</P> - */ - @Deprecated - static final String IS_SHORTCUT = "isShortcut"; - - /** - * The URI associated with the favorite. It is used, for instance, by - * live folders to find the content provider. - * <P>Type: TEXT</P> - */ - @Deprecated - static final String URI = "uri"; - - /** - * The display mode if the item is a live folder. - * <P>Type: INTEGER</P> - * - * @see android.provider.LiveFolders#DISPLAY_MODE_GRID - * @see android.provider.LiveFolders#DISPLAY_MODE_LIST - */ - @Deprecated - static final String DISPLAY_MODE = "displayMode"; /** * Boolean indicating that his item was restored and not yet successfully bound. |