Revert "Improve PreviewsColumns Implementation"

This reverts commit 0f177c589b3893437772d05d8349c8dc415a2db6.

Change-Id: I22cd81586c10c27bcdc4ff8019dfb98945d2ca80

4 files changed, 129 insertions, 288 deletions

diff --git a/src/com/cyngn/theme/chooser/ComponentSelector.java b/src/com/cyngn/theme/chooser/ComponentSelector.java
index 25d25a8..7423dde 100644
--- a/src/com/cyngn/theme/chooser/ComponentSelector.java
+++ b/src/com/cyngn/theme/chooser/ComponentSelector.java
@@ -13,7 +13,6 @@ import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.media.MediaPlayer;
 import android.media.RingtoneManager;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -286,113 +285,66 @@ public class ComponentSelector extends LinearLayout
 
     @Override
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-        Uri uri = PreviewColumns.COMPONENTS_URI;
         String selection;
         String[] selectionArgs = { "1" };
         String[] projection = { ThemesColumns.TITLE, ThemesColumns.PKG_NAME };
         switch(id) {
             case LOADER_ID_STATUS_BAR:
+                selection = MODIFIES_STATUS_BAR + "=?";
                 projection = new String[] {
-                        ThemesColumns.PKG_NAME,
+                        PreviewColumns.STATUSBAR_WIFI_ICON,
+                        PreviewColumns.STATUSBAR_SIGNAL_ICON,
+                        PreviewColumns.STATUSBAR_BLUETOOTH_ICON,
+                        PreviewColumns.STATUSBAR_BACKGROUND,
+                        PreviewColumns.STATUSBAR_BATTERY_CIRCLE,
+                        PreviewColumns.STATUSBAR_BATTERY_LANDSCAPE,
+                        PreviewColumns.STATUSBAR_BATTERY_PORTRAIT,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_BACKGROUND),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_WIFI_ICON),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_CIRCLE),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_LANDSCAPE),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_PORTRAIT)
-                };
-                selection = MODIFIES_STATUS_BAR + "=? AND (" +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=?" +
-                        ")";
-                selectionArgs = new String[] {
-                        "1",
-                        PreviewColumns.KEY_STATUSBAR_WIFI_ICON,
-                        PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON,
-                        PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON,
-                        PreviewColumns.KEY_STATUSBAR_BACKGROUND,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_CIRCLE,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_LANDSCAPE,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_PORTRAIT
+                        ThemesColumns.PKG_NAME
                 };
                 break;
             case LOADER_ID_NAVIGATION_BAR:
+                selection = MODIFIES_NAVIGATION_BAR + "=?";
                 projection = new String[] {
-                        ThemesColumns.PKG_NAME,
+                        PreviewColumns.NAVBAR_BACK_BUTTON,
+                        PreviewColumns.STATUSBAR_BACKGROUND,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_BACKGROUND),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_NAVBAR_BACK_BUTTON)
-                };
-                selection = MODIFIES_NAVIGATION_BAR + "=? AND (" +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=?" +
-                        ")";
-                selectionArgs = new String[] {
-                        "1",
-                        PreviewColumns.KEY_NAVBAR_BACK_BUTTON,
-                        PreviewColumns.KEY_STATUSBAR_BACKGROUND
+                        ThemesColumns.PKG_NAME,
                 };
                 break;
             case LOADER_ID_FONT:
                 selection = MODIFIES_FONTS + "=?";
                 break;
             case LOADER_ID_ICON:
+                selection = MODIFIES_ICONS + "=?";
                 projection = new String[] {
-                        ThemesColumns.PKG_NAME,
+                        PreviewColumns.ICON_PREVIEW_1,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_ICON_PREVIEW_1)
-                };
-                selection = MODIFIES_ICONS + "=? AND " + PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        "1",
-                        PreviewColumns.KEY_ICON_PREVIEW_1
+                        ThemesColumns.PKG_NAME
                 };
                 break;
             case LOADER_ID_STYLE:
+                selection = MODIFIES_OVERLAYS + "=?";
                 projection = new String[] {
-                        ThemesColumns.PKG_NAME,
+                        PreviewColumns.STYLE_THUMBNAIL,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STYLE_THUMBNAIL)
-                };
-                selection = MODIFIES_OVERLAYS + "=? AND " + PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        "1",
-                        PreviewColumns.KEY_STYLE_THUMBNAIL
+                        ThemesColumns.PKG_NAME
                 };
                 break;
             case LOADER_ID_WALLPAPER:
+                selection = MODIFIES_LAUNCHER + "=?";
                 projection = new String[] {
-                        ThemesColumns.PKG_NAME,
+                        PreviewColumns.WALLPAPER_THUMBNAIL,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_WALLPAPER_THUMBNAIL)
-                };
-                selection = MODIFIES_LAUNCHER + "=? AND " + PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        "1",
-                        PreviewColumns.KEY_WALLPAPER_THUMBNAIL
+                        ThemesColumns.PKG_NAME
                 };
                 break;
             case LOADER_ID_BOOTANIMATIONS:
+                selection = MODIFIES_BOOT_ANIM + "=?";
                 projection = new String[] {
-                        ThemesColumns.PKG_NAME,
+                        PreviewColumns.BOOTANIMATION_THUMBNAIL,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_BOOTANIMATION_THUMBNAIL)
-                };
-                selection = MODIFIES_BOOT_ANIM + "=? AND " + PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        "1",
-                        PreviewColumns.KEY_BOOTANIMATION_THUMBNAIL
+                        ThemesColumns.PKG_NAME
                 };
                 break;
             case LOADER_ID_RINGTONE:
@@ -405,15 +357,11 @@ public class ComponentSelector extends LinearLayout
                 selection = MODIFIES_ALARMS + "=?";
                 break;
             case LOADER_ID_LOCKSCREEN:
+                selection = MODIFIES_LOCKSCREEN + "=?";
                 projection = new String[] {
-                        ThemesColumns.PKG_NAME,
+                        PreviewColumns.LOCK_WALLPAPER_THUMBNAIL,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_LOCK_WALLPAPER_THUMBNAIL)
-                };
-                selection = MODIFIES_LOCKSCREEN + "=? AND " + PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        "1",
-                        PreviewColumns.KEY_LOCK_WALLPAPER_THUMBNAIL
+                        ThemesColumns.PKG_NAME
                 };
                 break;
             default:
@@ -422,7 +370,8 @@ public class ComponentSelector extends LinearLayout
         // sort in ascending order but make sure the "default" theme is always first
         String sortOrder = "(" + ThemesContract.ThemesColumns.IS_DEFAULT_THEME + "=1) DESC, "
                 + ThemesContract.ThemesColumns.TITLE + " ASC";
-        return new CursorLoader(mContext, uri, projection, selection, selectionArgs, sortOrder);
+        return new CursorLoader(mContext, PreviewColumns.CONTENT_URI,
+                projection, selection, selectionArgs, sortOrder);
     }
 
     @Override
@@ -498,7 +447,7 @@ public class ComponentSelector extends LinearLayout
         }
         if (MODIFIES_LAUNCHER.equals(mComponentType)) {
             return newWallpapersView(cursor, container, position,
-                    cursor.getColumnIndex(PreviewColumns.KEY_WALLPAPER_THUMBNAIL));
+                    cursor.getColumnIndex(PreviewColumns.WALLPAPER_THUMBNAIL));
         }
         if (MODIFIES_BOOT_ANIM.equals(mComponentType)) {
             return newBootanimationView(cursor, container, position);
@@ -510,7 +459,7 @@ public class ComponentSelector extends LinearLayout
         }
         if (MODIFIES_LOCKSCREEN.equals(mComponentType)) {
             return newWallpapersView(cursor, container, position,
-                    cursor.getColumnIndex(PreviewColumns.KEY_LOCK_WALLPAPER_THUMBNAIL));
+                    cursor.getColumnIndex(PreviewColumns.LOCK_WALLPAPER_THUMBNAIL));
         }
         return null;
     }
@@ -519,11 +468,11 @@ public class ComponentSelector extends LinearLayout
         cursor.moveToPosition(position);
         View v = mInflater.inflate(R.layout.status_bar_component_selection_item,
                                    parent, false);
-        int wifiIndex = cursor.getColumnIndex(PreviewColumns.KEY_STATUSBAR_WIFI_ICON);
-        int signalIndex = cursor.getColumnIndex(PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON);
-        int bluetoothIndex = cursor.getColumnIndex(PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON);
-        int batteryIndex = cursor.getColumnIndex(Utils.getBatteryKey(mBatteryStyle));
-        int backgroundIndex = cursor.getColumnIndex(PreviewColumns.KEY_STATUSBAR_BACKGROUND);
+        int wifiIndex = cursor.getColumnIndex(PreviewColumns.STATUSBAR_WIFI_ICON);
+        int signalIndex = cursor.getColumnIndex(PreviewColumns.STATUSBAR_SIGNAL_ICON);
+        int bluetoothIndex = cursor.getColumnIndex(PreviewColumns.STATUSBAR_BLUETOOTH_ICON);
+        int batteryIndex = cursor.getColumnIndex(Utils.getBatteryIndex(mBatteryStyle));
+        int backgroundIndex = cursor.getColumnIndex(PreviewColumns.STATUSBAR_BACKGROUND);
         int pkgNameIndex = cursor.getColumnIndex(ThemesContract.ThemesColumns.PKG_NAME);
 
         ((ImageView) v.findViewById(R.id.slot1)).setImageBitmap(
@@ -546,8 +495,8 @@ public class ComponentSelector extends LinearLayout
         cursor.moveToPosition(position);
         View v = mInflater.inflate(R.layout.navigation_bar_component_selection_item, parent,
                 false);
-        int backIndex = cursor.getColumnIndex(PreviewColumns.KEY_NAVBAR_BACK_BUTTON);
-        int backgroundIndex = cursor.getColumnIndex(PreviewColumns.KEY_STATUSBAR_BACKGROUND);
+        int backIndex = cursor.getColumnIndex(PreviewColumns.NAVBAR_BACK_BUTTON);
+        int backgroundIndex = cursor.getColumnIndex(PreviewColumns.STATUSBAR_BACKGROUND);
         int pkgNameIndex = cursor.getColumnIndex(ThemesContract.ThemesColumns.PKG_NAME);
 
         ((ImageView) v.findViewById(R.id.back)).setImageBitmap(
@@ -582,7 +531,7 @@ public class ComponentSelector extends LinearLayout
         cursor.moveToPosition(position);
         View v = mInflater.inflate(R.layout.icon_component_selection_item, parent,
                 false);
-        int iconIndex = cursor.getColumnIndex(PreviewColumns.KEY_ICON_PREVIEW_1);
+        int iconIndex = cursor.getColumnIndex(PreviewColumns.ICON_PREVIEW_1);
         int pkgNameIndex = cursor.getColumnIndex(ThemesContract.ThemesColumns.PKG_NAME);
 
         ((ImageView) v.findViewById(R.id.icon)).setImageBitmap(
@@ -597,7 +546,7 @@ public class ComponentSelector extends LinearLayout
         cursor.moveToPosition(position);
         View v = mInflater.inflate(R.layout.icon_component_selection_item, parent,
                 false);
-        int styleIndex = cursor.getColumnIndex(PreviewColumns.KEY_STYLE_THUMBNAIL);
+        int styleIndex = cursor.getColumnIndex(PreviewColumns.STYLE_THUMBNAIL);
         int pkgNameIndex = cursor.getColumnIndex(ThemesContract.ThemesColumns.PKG_NAME);
 
         ((ImageView) v.findViewById(R.id.icon)).setImageBitmap(
@@ -638,7 +587,7 @@ public class ComponentSelector extends LinearLayout
         cursor.moveToPosition(position);
         View v = mInflater.inflate(R.layout.bootani_component_selection_item, parent,
                 false);
-        int wallpaperIndex = cursor.getColumnIndex(PreviewColumns.KEY_BOOTANIMATION_THUMBNAIL);
+        int wallpaperIndex = cursor.getColumnIndex(PreviewColumns.BOOTANIMATION_THUMBNAIL);
         int pkgNameIndex = cursor.getColumnIndex(ThemesContract.ThemesColumns.PKG_NAME);
 
         ((ImageView) v.findViewById(R.id.preview)).setImageBitmap(
diff --git a/src/com/cyngn/theme/chooser/MyThemeFragment.java b/src/com/cyngn/theme/chooser/MyThemeFragment.java
index f74d53b..b1cfa89 100644
--- a/src/com/cyngn/theme/chooser/MyThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/MyThemeFragment.java
@@ -334,8 +334,29 @@ public class MyThemeFragment extends ThemeFragment {
                         return super.onCreateLoader(id, args);
                     }
                 }
+                projection = new String[]{
+                        PreviewColumns.WALLPAPER_PREVIEW,
+                        PreviewColumns.STATUSBAR_BACKGROUND,
+                        PreviewColumns.STATUSBAR_WIFI_ICON,
+                        PreviewColumns.STATUSBAR_WIFI_COMBO_MARGIN_END,
+                        PreviewColumns.STATUSBAR_BLUETOOTH_ICON,
+                        PreviewColumns.STATUSBAR_SIGNAL_ICON,
+                        PreviewColumns.STATUSBAR_CLOCK_TEXT_COLOR,
+                        PreviewColumns.STATUSBAR_BATTERY_CIRCLE,
+                        PreviewColumns.STATUSBAR_BATTERY_LANDSCAPE,
+                        PreviewColumns.STATUSBAR_BATTERY_PORTRAIT,
+                        PreviewColumns.NAVBAR_BACK_BUTTON,
+                        PreviewColumns.NAVBAR_HOME_BUTTON,
+                        PreviewColumns.NAVBAR_RECENT_BUTTON,
+                        PreviewColumns.ICON_PREVIEW_1,
+                        PreviewColumns.ICON_PREVIEW_2,
+                        PreviewColumns.ICON_PREVIEW_3,
+                        PreviewColumns.LOCK_WALLPAPER_PREVIEW,
+                        PreviewColumns.STYLE_PREVIEW,
+                        PreviewColumns.NAVBAR_BACKGROUND
+                };
                 uri = PreviewColumns.APPLIED_URI;
-                return new CursorLoader(getActivity(), uri, null, null, null, null);
+                return new CursorLoader(getActivity(), uri, projection, null, null, null);
             default:
                 // Only LOADER_ID_ALL differs for MyThemeFragment
                 return super.onCreateLoader(id, args);
@@ -411,7 +432,7 @@ public class MyThemeFragment extends ThemeFragment {
             overlay = getOverlayDrawable(mWallpaperCard, true);
         }
 
-        int wpIdx = c.getColumnIndex(PreviewColumns.KEY_WALLPAPER_PREVIEW);
+        int wpIdx = c.getColumnIndex(PreviewColumns.WALLPAPER_PREVIEW);
         final Resources res = getResources();
         final Context context = getActivity();
         final WallpaperManager wm = WallpaperManager.getInstance(context);
@@ -455,7 +476,7 @@ public class MyThemeFragment extends ThemeFragment {
             overlay = getOverlayDrawable(mLockScreenCard, true);
         }
 
-        int wpIdx = c.getColumnIndex(PreviewColumns.KEY_LOCK_WALLPAPER_PREVIEW);
+        int wpIdx = c.getColumnIndex(PreviewColumns.LOCK_WALLPAPER_PREVIEW);
         final Resources res = getResources();
         final Context context = getActivity();
         Drawable wp = context == null ? null :
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java
index 09d119b..585dd67 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/ThemeFragment.java
@@ -1197,7 +1197,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
         if (args != null) {
             pkgName = args.getString(ARG_PACKAGE_NAME);
         }
-        Uri uri = PreviewColumns.CONTENT_URI;
+        Uri uri = ThemesContract.PreviewColumns.CONTENT_URI;
         String selection = ThemesContract.ThemesColumns.PKG_NAME + "= ?";
         String[] selectionArgs = new String[] { pkgName };
         String[] projection = null;
@@ -1223,115 +1223,39 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
                         ThemesColumns.MODIFIES_STATUS_BAR,
                         ThemesColumns.MODIFIES_NOTIFICATIONS,
                         //Previews
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_WALLPAPER_PREVIEW),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_BACKGROUND),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_WIFI_ICON),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_WIFI_COMBO_MARGIN_END),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_CLOCK_TEXT_COLOR),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_CIRCLE),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_LANDSCAPE),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_PORTRAIT),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_NAVBAR_BACK_BUTTON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_NAVBAR_HOME_BUTTON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_NAVBAR_RECENT_BUTTON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_ICON_PREVIEW_1),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_ICON_PREVIEW_2),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_ICON_PREVIEW_3),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_LOCK_WALLPAPER_PREVIEW),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STYLE_PREVIEW)
-                };
-                selection = ThemesContract.ThemesColumns.PKG_NAME + "=? AND (" +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=?" +
-                        ")";
-                selectionArgs = new String[] {
-                        pkgName,
-                        PreviewColumns.KEY_WALLPAPER_PREVIEW,
-                        PreviewColumns.KEY_STATUSBAR_BACKGROUND,
-                        PreviewColumns.KEY_STATUSBAR_WIFI_ICON,
-                        PreviewColumns.KEY_STATUSBAR_WIFI_COMBO_MARGIN_END,
-                        PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON,
-                        PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON,
-                        PreviewColumns.KEY_STATUSBAR_CLOCK_TEXT_COLOR,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_CIRCLE,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_LANDSCAPE,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_PORTRAIT,
-                        PreviewColumns.KEY_NAVBAR_BACK_BUTTON,
-                        PreviewColumns.KEY_NAVBAR_HOME_BUTTON,
-                        PreviewColumns.KEY_NAVBAR_RECENT_BUTTON,
-                        PreviewColumns.KEY_ICON_PREVIEW_1,
-                        PreviewColumns.KEY_ICON_PREVIEW_2,
-                        PreviewColumns.KEY_ICON_PREVIEW_3,
-                        PreviewColumns.KEY_LOCK_WALLPAPER_PREVIEW,
-                        PreviewColumns.KEY_STYLE_PREVIEW
+                        PreviewColumns.WALLPAPER_PREVIEW,
+                        PreviewColumns.STATUSBAR_BACKGROUND,
+                        PreviewColumns.STATUSBAR_WIFI_ICON,
+                        PreviewColumns.STATUSBAR_WIFI_COMBO_MARGIN_END,
+                        PreviewColumns.STATUSBAR_BLUETOOTH_ICON,
+                        PreviewColumns.STATUSBAR_SIGNAL_ICON,
+                        PreviewColumns.STATUSBAR_CLOCK_TEXT_COLOR,
+                        PreviewColumns.STATUSBAR_BATTERY_CIRCLE,
+                        PreviewColumns.STATUSBAR_BATTERY_LANDSCAPE,
+                        PreviewColumns.STATUSBAR_BATTERY_PORTRAIT,
+                        PreviewColumns.NAVBAR_BACK_BUTTON,
+                        PreviewColumns.NAVBAR_HOME_BUTTON,
+                        PreviewColumns.NAVBAR_RECENT_BUTTON,
+                        PreviewColumns.ICON_PREVIEW_1,
+                        PreviewColumns.ICON_PREVIEW_2,
+                        PreviewColumns.ICON_PREVIEW_3,
+                        PreviewColumns.LOCK_WALLPAPER_PREVIEW,
+                        PreviewColumns.STYLE_PREVIEW
                 };
                 break;
             case LOADER_ID_STATUS_BAR:
                 projection = new String[] {
                         ThemesColumns.PKG_NAME,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_BACKGROUND),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_WIFI_ICON),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_WIFI_COMBO_MARGIN_END),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_CLOCK_TEXT_COLOR),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_CIRCLE),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_LANDSCAPE),
-                        Utils.getProjectionFromKeyValue(
-                                PreviewColumns.KEY_STATUSBAR_BATTERY_PORTRAIT)
-                };
-                selection = ThemesContract.ThemesColumns.PKG_NAME + "=? AND (" +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=?" +
-                        ")";
-                selectionArgs = new String[] {
-                        pkgName,
-                        PreviewColumns.KEY_STATUSBAR_BACKGROUND,
-                        PreviewColumns.KEY_STATUSBAR_WIFI_ICON,
-                        PreviewColumns.KEY_STATUSBAR_WIFI_COMBO_MARGIN_END,
-                        PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON,
-                        PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON,
-                        PreviewColumns.KEY_STATUSBAR_CLOCK_TEXT_COLOR,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_CIRCLE,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_LANDSCAPE,
-                        PreviewColumns.KEY_STATUSBAR_BATTERY_PORTRAIT
+                        PreviewColumns.STATUSBAR_BACKGROUND,
+                        PreviewColumns.STATUSBAR_WIFI_ICON,
+                        PreviewColumns.STATUSBAR_WIFI_COMBO_MARGIN_END,
+                        PreviewColumns.STATUSBAR_BLUETOOTH_ICON,
+                        PreviewColumns.STATUSBAR_SIGNAL_ICON,
+                        PreviewColumns.STATUSBAR_CLOCK_TEXT_COLOR,
+                        PreviewColumns.STATUSBAR_BATTERY_CIRCLE,
+                        PreviewColumns.STATUSBAR_BATTERY_LANDSCAPE,
+                        PreviewColumns.STATUSBAR_BATTERY_PORTRAIT
                 };
                 break;
             case LOADER_ID_FONT:
@@ -1344,83 +1268,41 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
                 projection = new String[] {
                         ThemesColumns.PKG_NAME,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_ICON_PREVIEW_1),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_ICON_PREVIEW_2),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_ICON_PREVIEW_3)
-                };
-                selection = ThemesContract.ThemesColumns.PKG_NAME + "=? AND (" +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=?" +
-                        ")";
-                selectionArgs = new String[] {
-                        pkgName,
-                        PreviewColumns.KEY_ICON_PREVIEW_1,
-                        PreviewColumns.KEY_ICON_PREVIEW_2,
-                        PreviewColumns.KEY_ICON_PREVIEW_3
+                        PreviewColumns.ICON_PREVIEW_1,
+                        PreviewColumns.ICON_PREVIEW_2,
+                        PreviewColumns.ICON_PREVIEW_3,
+                        PreviewColumns.ICON_PREVIEW_4
                 };
                 break;
             case LOADER_ID_WALLPAPER:
                 projection = new String[] {
                         ThemesColumns.PKG_NAME,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_WALLPAPER_PREVIEW)
-                };
-                selection = ThemesContract.ThemesColumns.PKG_NAME + "=? AND " +
-                        PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        pkgName,
-                        PreviewColumns.KEY_WALLPAPER_PREVIEW
+                        PreviewColumns.WALLPAPER_PREVIEW
                 };
                 break;
             case LOADER_ID_NAVIGATION_BAR:
                 projection = new String[] {
                         ThemesColumns.PKG_NAME,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STATUSBAR_BACKGROUND),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_NAVBAR_BACK_BUTTON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_NAVBAR_HOME_BUTTON),
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_NAVBAR_RECENT_BUTTON)
-                };
-                selection = ThemesContract.ThemesColumns.PKG_NAME + "=? AND (" +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=? OR " +
-                        PreviewColumns.COL_KEY + "=?" +
-                        ")";
-                selectionArgs = new String[] {
-                        pkgName,
-                        PreviewColumns.KEY_STATUSBAR_BACKGROUND,
-                        PreviewColumns.KEY_NAVBAR_BACK_BUTTON,
-                        PreviewColumns.KEY_NAVBAR_HOME_BUTTON,
-                        PreviewColumns.KEY_NAVBAR_RECENT_BUTTON
+                        PreviewColumns.STATUSBAR_BACKGROUND,
+                        PreviewColumns.NAVBAR_BACK_BUTTON,
+                        PreviewColumns.NAVBAR_HOME_BUTTON,
+                        PreviewColumns.NAVBAR_RECENT_BUTTON
                 };
                 break;
             case LOADER_ID_LOCKSCREEN:
                 projection = new String[]{
                         ThemesColumns.PKG_NAME,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_LOCK_WALLPAPER_PREVIEW)
-                };
-                selection = ThemesContract.ThemesColumns.PKG_NAME + "=? AND " +
-                        PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        pkgName,
-                        PreviewColumns.KEY_LOCK_WALLPAPER_PREVIEW
+                        PreviewColumns.LOCK_WALLPAPER_PREVIEW
                 };
                 break;
             case LOADER_ID_STYLE:
                 projection = new String[] {
                         ThemesColumns.PKG_NAME,
                         ThemesColumns.TITLE,
-                        Utils.getProjectionFromKeyValue(PreviewColumns.KEY_STYLE_PREVIEW)
-                };
-                selection = ThemesContract.ThemesColumns.PKG_NAME + "=? AND " +
-                        PreviewColumns.COL_KEY + "=?";
-                selectionArgs = new String[] {
-                        pkgName,
-                        PreviewColumns.KEY_STYLE_PREVIEW
+                        PreviewColumns.STYLE_PREVIEW
                 };
                 break;
             case LOADER_ID_BOOT_ANIMATION:
@@ -1636,7 +1518,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
         if (mWallpaperCard.isShowingEmptyView()) mWallpaperCard.setEmptyViewEnabled(false);
 
         int pkgNameIdx = c.getColumnIndex(ThemesColumns.PKG_NAME);
-        int wpIdx = c.getColumnIndex(PreviewColumns.KEY_WALLPAPER_PREVIEW);
+        int wpIdx = c.getColumnIndex(PreviewColumns.WALLPAPER_PREVIEW);
         final Resources res = getResources();
         Bitmap bitmap = Utils.loadBitmapBlob(c, wpIdx);
         if (bitmap != null) {
@@ -1669,7 +1551,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
         if (mLockScreenCard.isShowingEmptyView()) mLockScreenCard.setEmptyViewEnabled(false);
 
         int pkgNameIdx = c.getColumnIndex(ThemesColumns.PKG_NAME);
-        int wpIdx = c.getColumnIndex(PreviewColumns.KEY_LOCK_WALLPAPER_PREVIEW);
+        int wpIdx = c.getColumnIndex(PreviewColumns.LOCK_WALLPAPER_PREVIEW);
         final Resources res = getResources();
         Bitmap bitmap = Utils.loadBitmapBlob(c, wpIdx);
         if (bitmap != null) {
@@ -1692,13 +1574,13 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
     }
 
     protected void loadStatusBar(Cursor c, boolean animate) {
-        int backgroundIdx = c.getColumnIndex(PreviewColumns.KEY_STATUSBAR_BACKGROUND);
-        int wifiIdx = c.getColumnIndex(PreviewColumns.KEY_STATUSBAR_WIFI_ICON);
-        int wifiMarginIdx = c.getColumnIndex(PreviewColumns.KEY_STATUSBAR_WIFI_COMBO_MARGIN_END);
-        int bluetoothIdx = c.getColumnIndex(PreviewColumns.KEY_STATUSBAR_BLUETOOTH_ICON);
-        int signalIdx = c.getColumnIndex(PreviewColumns.KEY_STATUSBAR_SIGNAL_ICON);
-        int batteryIdx = c.getColumnIndex(Utils.getBatteryKey(mBatteryStyle));
-        int clockColorIdx = c.getColumnIndex(PreviewColumns.KEY_STATUSBAR_CLOCK_TEXT_COLOR);
+        int backgroundIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_BACKGROUND);
+        int wifiIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_WIFI_ICON);
+        int wifiMarginIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_WIFI_COMBO_MARGIN_END);
+        int bluetoothIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_BLUETOOTH_ICON);
+        int signalIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_SIGNAL_ICON);
+        int batteryIdx = c.getColumnIndex(Utils.getBatteryIndex(mBatteryStyle));
+        int clockColorIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_CLOCK_TEXT_COLOR);
         int pkgNameIdx = c.getColumnIndex(ThemesColumns.PKG_NAME);
 
         Bitmap background = Utils.loadBitmapBlob(c, backgroundIdx);
@@ -1756,10 +1638,11 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
         if (mIconCard.isShowingEmptyView()) {
             mIconCard.setEmptyViewEnabled(false);
         }
-        int[] iconIdx = new int[3];
-        iconIdx[0] = c.getColumnIndex(PreviewColumns.KEY_ICON_PREVIEW_1);
-        iconIdx[1] = c.getColumnIndex(PreviewColumns.KEY_ICON_PREVIEW_2);
-        iconIdx[2] = c.getColumnIndex(PreviewColumns.KEY_ICON_PREVIEW_3);
+        int[] iconIdx = new int[4];
+        iconIdx[0] = c.getColumnIndex(PreviewColumns.ICON_PREVIEW_1);
+        iconIdx[1] = c.getColumnIndex(PreviewColumns.ICON_PREVIEW_2);
+        iconIdx[2] = c.getColumnIndex(PreviewColumns.ICON_PREVIEW_3);
+        iconIdx[3] = c.getColumnIndex(PreviewColumns.ICON_PREVIEW_4);
         int pkgNameIdx = c.getColumnIndex(ThemesColumns.PKG_NAME);
 
         // Set the icons. If the provider does not have an icon preview then
@@ -1817,12 +1700,12 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
     }
 
     protected void loadNavBar(Cursor c, boolean animate) {
-        int backButtonIdx = c.getColumnIndex(PreviewColumns.KEY_NAVBAR_BACK_BUTTON);
-        int homeButtonIdx = c.getColumnIndex(PreviewColumns.KEY_NAVBAR_HOME_BUTTON);
-        int recentButtonIdx = c.getColumnIndex(PreviewColumns.KEY_NAVBAR_RECENT_BUTTON);
-        int backgroundIdx = c.getColumnIndex(PreviewColumns.KEY_NAVBAR_BACKGROUND);
+        int backButtonIdx = c.getColumnIndex(PreviewColumns.NAVBAR_BACK_BUTTON);
+        int homeButtonIdx = c.getColumnIndex(PreviewColumns.NAVBAR_HOME_BUTTON);
+        int recentButtonIdx = c.getColumnIndex(PreviewColumns.NAVBAR_RECENT_BUTTON);
+        int backgroundIdx = c.getColumnIndex(PreviewColumns.NAVBAR_BACKGROUND);
         if (backgroundIdx == -1) {
-            backgroundIdx = c.getColumnIndex(PreviewColumns.KEY_STATUSBAR_BACKGROUND);
+            backgroundIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_BACKGROUND);
         }
         int pkgNameIdx = c.getColumnIndex(ThemesColumns.PKG_NAME);
 
@@ -1889,7 +1772,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
         }
 
         int pkgNameIdx = c.getColumnIndex(ThemesColumns.PKG_NAME);
-        int styleIdx = c.getColumnIndex(PreviewColumns.KEY_STYLE_PREVIEW);
+        int styleIdx = c.getColumnIndex(PreviewColumns.STYLE_PREVIEW);
         mStylePreview.setImageBitmap(Utils.loadBitmapBlob(c, styleIdx));
         if (pkgNameIdx > -1) {
             String pkgName = c.getString(pkgNameIdx);
diff --git a/src/com/cyngn/theme/util/Utils.java b/src/com/cyngn/theme/util/Utils.java
index 7b885a7..68c4211 100644
--- a/src/com/cyngn/theme/util/Utils.java
+++ b/src/com/cyngn/theme/util/Utils.java
@@ -274,14 +274,14 @@ public class Utils {
         return BitmapFactory.decodeByteArray(blob, 0, blob.length);
     }
 
-    public static String getBatteryKey(int type) {
+    public static String getBatteryIndex(int type) {
         switch(type) {
             case 2:
-                return ThemesContract.PreviewColumns.KEY_STATUSBAR_BATTERY_CIRCLE;
+                return ThemesContract.PreviewColumns.STATUSBAR_BATTERY_CIRCLE;
             case 5:
-                return ThemesContract.PreviewColumns.KEY_STATUSBAR_BATTERY_LANDSCAPE;
+                return ThemesContract.PreviewColumns.STATUSBAR_BATTERY_LANDSCAPE;
             default:
-                return ThemesContract.PreviewColumns.KEY_STATUSBAR_BATTERY_PORTRAIT;
+                return ThemesContract.PreviewColumns.STATUSBAR_BATTERY_PORTRAIT;
         }
     }
 
@@ -546,16 +546,4 @@ public class Utils {
 
         return null;
     }
-
-    /**
-     * This allows pivoting key/value pairs as column/entry pairs.
-     * This is only needed when querying multiple keys at a time.
-     * @param keyValue
-     * @return
-     */
-    public static String getProjectionFromKeyValue(String keyValue) {
-        return String.format("MAX( CASE %s WHEN '%s' THEN %s ELSE NULL END) AS %s",
-                ThemesContract.PreviewColumns.COL_KEY, keyValue,
-                ThemesContract.PreviewColumns.COL_VALUE, keyValue);
-    }
 }