summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-02-23 14:26:05 -0800
committerClark Scheff <clark@cyngn.com>2016-03-04 21:44:22 +0000
commit0e77fa6404babeaa5acc4edc9fb2dcbc01b6d6f2 (patch)
treea29f90a769a091698fe2556ad5d776058fa9e977 /src
parentcdc0bbdf4a7200f6af481db7fab33ea6f94be4c8 (diff)
downloadpackages_apps_ThemeChooser-0e77fa6404babeaa5acc4edc9fb2dcbc01b6d6f2.zip
packages_apps_ThemeChooser-0e77fa6404babeaa5acc4edc9fb2dcbc01b6d6f2.tar.gz
packages_apps_ThemeChooser-0e77fa6404babeaa5acc4edc9fb2dcbc01b6d6f2.tar.bz2
Themes: Refactor themes to CMSDK [1/3]
Change-Id: I441bb8de266fedec1988dd908f7f2864f90adf0a TICKET: CYNGNOS-2126
Diffstat (limited to 'src')
-rw-r--r--src/com/cyngn/theme/chooser/AppReceiver.java11
-rw-r--r--src/com/cyngn/theme/chooser/ChooserActivity.java15
-rw-r--r--src/com/cyngn/theme/chooser/ComponentSelector.java32
-rw-r--r--src/com/cyngn/theme/chooser/MyThemeFragment.java18
-rw-r--r--src/com/cyngn/theme/chooser/ThemeFragment.java55
-rw-r--r--src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java14
-rw-r--r--src/com/cyngn/theme/util/AudioUtils.java3
-rw-r--r--src/com/cyngn/theme/util/CursorLoaderHelper.java31
-rw-r--r--src/com/cyngn/theme/util/ThemedTypefaceHelper.java3
-rw-r--r--src/com/cyngn/theme/util/Utils.java8
10 files changed, 95 insertions, 95 deletions
diff --git a/src/com/cyngn/theme/chooser/AppReceiver.java b/src/com/cyngn/theme/chooser/AppReceiver.java
index b220bb7..4354f63 100644
--- a/src/com/cyngn/theme/chooser/AppReceiver.java
+++ b/src/com/cyngn/theme/chooser/AppReceiver.java
@@ -8,14 +8,15 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ThemeUtils;
import android.net.Uri;
-import android.provider.ThemesContract;
import android.text.TextUtils;
+
import com.cyngn.theme.util.NotificationHelper;
import com.cyngn.theme.util.PreferenceUtils;
import com.cyngn.theme.util.Utils;
+import cyanogenmod.providers.ThemesContract;
+
public class AppReceiver extends BroadcastReceiver {
@Override
@@ -24,11 +25,11 @@ public class AppReceiver extends BroadcastReceiver {
String pkgName = uri != null ? uri.getSchemeSpecificPart() : null;
String action = intent.getAction();
- if (ThemesContract.Intent.ACTION_THEME_INSTALLED.equals(action)) {
+ if (cyanogenmod.content.Intent.ACTION_THEME_INSTALLED.equals(action)) {
if (!pkgName.equals(Utils.getDefaultThemePackageName(context))) {
NotificationHelper.postThemeInstalledNotification(context, pkgName);
}
- } else if (ThemesContract.Intent.ACTION_THEME_REMOVED.equals(action)) {
+ } else if (cyanogenmod.content.Intent.ACTION_THEME_REMOVED.equals(action)) {
// remove updated status for this theme (if one exists)
PreferenceUtils.removeUpdatedTheme(context, pkgName);
@@ -40,7 +41,7 @@ public class AppReceiver extends BroadcastReceiver {
Utils.getDefaultThemePackageName(context));
}
NotificationHelper.cancelNotifications(context);
- } else if (ThemesContract.Intent.ACTION_THEME_UPDATED.equals(action)) {
+ } else if (cyanogenmod.content.Intent.ACTION_THEME_UPDATED.equals(action)) {
try {
if (isTheme(context, pkgName)) {
PreferenceUtils.addUpdatedTheme(context, pkgName);
diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/com/cyngn/theme/chooser/ChooserActivity.java
index ee6f7db..b697a7e 100644
--- a/src/com/cyngn/theme/chooser/ChooserActivity.java
+++ b/src/com/cyngn/theme/chooser/ChooserActivity.java
@@ -28,8 +28,6 @@ import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.RemoteException;
-import android.provider.ThemesContract;
-import android.provider.ThemesContract.ThemesColumns;
import android.renderscript.Allocation;
import android.renderscript.Element;
import android.renderscript.RenderScript;
@@ -51,8 +49,8 @@ import android.view.ViewPropertyAnimator;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.view.animation.DecelerateInterpolator;
-
import android.widget.ImageView;
+
import com.cyngn.theme.perapptheming.PerAppThemingWindow;
import com.cyngn.theme.util.CursorLoaderHelper;
import com.cyngn.theme.util.NotificationHelper;
@@ -60,14 +58,17 @@ import com.cyngn.theme.util.PreferenceUtils;
import com.cyngn.theme.util.TypefaceHelperCache;
import com.cyngn.theme.util.Utils;
+import cyanogenmod.providers.ThemesContract;
+import cyanogenmod.providers.ThemesContract.ThemesColumns;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
import static com.cyngn.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
diff --git a/src/com/cyngn/theme/chooser/ComponentSelector.java b/src/com/cyngn/theme/chooser/ComponentSelector.java
index 18f6ecf..bceb43b 100644
--- a/src/com/cyngn/theme/chooser/ComponentSelector.java
+++ b/src/com/cyngn/theme/chooser/ComponentSelector.java
@@ -6,7 +6,6 @@ package com.cyngn.theme.chooser;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.content.pm.ThemeUtils;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.database.ContentObserver;
@@ -20,9 +19,6 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.provider.Settings;
-import android.provider.ThemesContract;
-import android.provider.ThemesContract.PreviewColumns;
-import android.provider.ThemesContract.ThemesColumns;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
@@ -48,20 +44,24 @@ import com.cyngn.theme.util.ThemedTypefaceHelper;
import com.cyngn.theme.util.TypefaceHelperCache;
import com.cyngn.theme.util.Utils;
+import cyanogenmod.providers.ThemesContract;
+import cyanogenmod.providers.ThemesContract.PreviewColumns;
+import cyanogenmod.providers.ThemesContract.ThemesColumns;
+
import java.util.Map;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LAUNCHER;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LOCKSCREEN;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_OVERLAYS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_STATUS_BAR;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NAVIGATION_BAR;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ICONS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_FONTS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LAUNCHER;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LOCKSCREEN;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_OVERLAYS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_STATUS_BAR;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NAVIGATION_BAR;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ICONS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_FONTS;
import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_LIVE_LOCK_SCREEN;
import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_STATUS_BAR;
diff --git a/src/com/cyngn/theme/chooser/MyThemeFragment.java b/src/com/cyngn/theme/chooser/MyThemeFragment.java
index 800faea..e4f582b 100644
--- a/src/com/cyngn/theme/chooser/MyThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/MyThemeFragment.java
@@ -8,11 +8,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.ThemeUtils;
import android.content.res.Resources;
-import android.content.res.ThemeChangeRequest;
-import android.content.res.ThemeChangeRequest.RequestType;
-import android.content.res.ThemeManager;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.Typeface;
@@ -23,9 +19,6 @@ import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Bundle;
-import android.provider.ThemesContract;
-import android.provider.ThemesContract.PreviewColumns;
-import android.provider.ThemesContract.ThemesColumns;
import android.support.v4.content.Loader;
import android.util.Log;
import android.util.MutableLong;
@@ -46,6 +39,15 @@ import com.cyngn.theme.util.ThemedTypefaceHelper;
import com.cyngn.theme.util.TypefaceHelperCache;
import com.cyngn.theme.util.Utils;
+import cyanogenmod.providers.ThemesContract;
+import cyanogenmod.providers.ThemesContract.PreviewColumns;
+import cyanogenmod.providers.ThemesContract.ThemesColumns;
+import cyanogenmod.themes.ThemeChangeRequest;
+import cyanogenmod.themes.ThemeChangeRequest.RequestType;
+import cyanogenmod.themes.ThemeManager;
+
+import org.cyanogenmod.internal.util.ThemeUtils;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
@@ -291,7 +293,7 @@ public class MyThemeFragment extends ThemeFragment {
public void onReceive(Context context, Intent intent) {
// only update if we are the current visible fragment or if there is no theme
// being applied.
- ThemeManager tm = (ThemeManager) context.getSystemService(Context.THEME_SERVICE);
+ ThemeManager tm = getThemeManager();
if (!tm.isThemeApplying() || getUserVisibleHint()) {
final WallpaperManager wm = WallpaperManager.getInstance(context);
if (wm.getWallpaperInfo() != null) {
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java
index 577ffc9..a106fa6 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/ThemeFragment.java
@@ -3,7 +3,6 @@
*/
package com.cyngn.theme.chooser;
-import android.Manifest;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
@@ -18,14 +17,10 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.content.pm.ThemeUtils;
import android.content.res.AssetManager;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.content.res.ThemeChangeRequest;
-import android.content.res.ThemeChangeRequest.RequestType;
import android.content.res.ThemeConfig;
-import android.content.res.ThemeManager;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
@@ -44,13 +39,8 @@ import android.os.Build;
import android.os.Bundle;
import android.os.FileUtils;
import android.os.Handler;
-import android.provider.Settings;
-import android.provider.ThemesContract;
-import android.provider.ThemesContract.PreviewColumns;
-import android.provider.ThemesContract.ThemesColumns;
import android.support.v4.app.Fragment;
import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.text.TextUtils;
import android.util.Log;
@@ -76,9 +66,8 @@ import android.widget.PopupMenu;
import android.widget.ProgressBar;
import android.widget.Space;
import android.widget.TextView;
-
import android.widget.Toast;
-import com.android.internal.widget.LockPatternUtils;
+
import com.cyngn.theme.chooser.ComponentSelector.OnItemClickedListener;
import com.cyngn.theme.util.AudioUtils;
import com.cyngn.theme.util.BootAnimationHelper;
@@ -96,7 +85,14 @@ import com.cyngn.theme.widget.ThemeTagLayout;
import cyanogenmod.app.ThemeVersion;
import cyanogenmod.providers.CMSettings;
+import cyanogenmod.providers.ThemesContract.PreviewColumns;
+import cyanogenmod.providers.ThemesContract.ThemesColumns;
+import cyanogenmod.themes.ThemeChangeRequest;
+import cyanogenmod.themes.ThemeChangeRequest.RequestType;
+import cyanogenmod.themes.ThemeManager;
+
import org.cyanogenmod.internal.util.CmLockPatternUtils;
+import org.cyanogenmod.internal.util.ThemeUtils;
import java.io.File;
import java.io.IOException;
@@ -111,18 +107,19 @@ import java.util.zip.ZipFile;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LAUNCHER;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LOCKSCREEN;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_OVERLAYS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_STATUS_BAR;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NAVIGATION_BAR;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ICONS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_FONTS;
+
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LAUNCHER;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LOCKSCREEN;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_OVERLAYS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_STATUS_BAR;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NAVIGATION_BAR;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ICONS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_FONTS;
import static com.cyngn.theme.chooser.ComponentSelector.DEFAULT_COMPONENT_ID;
@@ -143,7 +140,7 @@ import static com.cyngn.theme.util.CursorLoaderHelper.LOADER_ID_LIVE_LOCK_SCREEN
import static cyanogenmod.providers.CMSettings.Secure.LIVE_LOCK_SCREEN_ENABLED;
-import static android.content.pm.ThemeUtils.SYSTEM_TARGET_API;
+import static org.cyanogenmod.internal.util.ThemeUtils.SYSTEM_TARGET_API;
public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallbacks<Cursor>,
ThemeManager.ThemeChangeListener, ThemeManager.ThemeProcessingListener {
@@ -1242,12 +1239,8 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
ThemeConfig.getSystemTheme().getFontPkgName();
}
- private ThemeManager getThemeManager() {
- final Context context = getActivity();
- if (context != null) {
- return (ThemeManager) context.getSystemService(Context.THEME_SERVICE);
- }
- return null;
+ protected ThemeManager getThemeManager() {
+ return ThemeManager.getInstance();
}
private void freeMediaPlayers() {
diff --git a/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java b/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java
index 91380be..0b85557 100644
--- a/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java
+++ b/src/com/cyngn/theme/perapptheming/PerAppThemingWindow.java
@@ -11,16 +11,13 @@ import android.content.Context;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.content.res.ThemeChangeRequest;
import android.content.res.ThemeConfig;
-import android.content.res.ThemeManager;
import android.database.ContentObserver;
import android.database.Cursor;
import android.graphics.PixelFormat;
import android.net.Uri;
import android.os.Handler;
import android.os.IBinder;
-import android.provider.ThemesContract.ThemesColumns;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -31,7 +28,6 @@ import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.WindowManager;
import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
import android.view.animation.OvershootInterpolator;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
@@ -39,11 +35,15 @@ import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
-
import android.widget.Toast;
+
import com.cyngn.theme.chooser.R;
import com.cyngn.theme.util.Utils;
+import cyanogenmod.providers.ThemesContract.ThemesColumns;
+import cyanogenmod.themes.ThemeChangeRequest;
+import cyanogenmod.themes.ThemeManager;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
@@ -330,7 +330,7 @@ public class PerAppThemingWindow extends Service implements OnTouchListener,
@Override
public void onFinish(boolean isSuccess) {
- ThemeManager tm = (ThemeManager) getSystemService(Context.THEME_SERVICE);
+ ThemeManager tm = ThemeManager.getInstance();
tm.removeClient(this);
mThemeListLayout.postDelayed(new Runnable() {
@Override
@@ -772,7 +772,7 @@ public class PerAppThemingWindow extends Service implements OnTouchListener,
hideThemeList(true, new Runnable() {
@Override
public void run() {
- ThemeManager tm = (ThemeManager) getSystemService(Context.THEME_SERVICE);
+ ThemeManager tm = ThemeManager.getInstance();
ThemeChangeRequest.Builder builder = new ThemeChangeRequest.Builder();
builder.setAppOverlay(appPkgName, themePkgName);
tm.addClient(PerAppThemingWindow.this);
diff --git a/src/com/cyngn/theme/util/AudioUtils.java b/src/com/cyngn/theme/util/AudioUtils.java
index 629232a..62076db 100644
--- a/src/com/cyngn/theme/util/AudioUtils.java
+++ b/src/com/cyngn/theme/util/AudioUtils.java
@@ -6,7 +6,6 @@ package com.cyngn.theme.util;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.content.pm.ThemeUtils;
import android.content.res.AssetFileDescriptor;
import android.content.res.AssetManager;
import android.content.res.ThemeConfig;
@@ -15,6 +14,8 @@ import android.media.RingtoneManager;
import android.net.Uri;
import android.util.Log;
+import org.cyanogenmod.internal.util.ThemeUtils;
+
import java.io.File;
import java.io.IOException;
diff --git a/src/com/cyngn/theme/util/CursorLoaderHelper.java b/src/com/cyngn/theme/util/CursorLoaderHelper.java
index c4fffa9..3d773e3 100644
--- a/src/com/cyngn/theme/util/CursorLoaderHelper.java
+++ b/src/com/cyngn/theme/util/CursorLoaderHelper.java
@@ -6,27 +6,26 @@ package com.cyngn.theme.util;
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import android.provider.ThemesContract;
-import android.provider.ThemesContract.MixnMatchColumns;
-import android.provider.ThemesContract.PreviewColumns;
-import android.provider.ThemesContract.ThemesColumns;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import cyanogenmod.app.ThemeVersion;
+import cyanogenmod.providers.ThemesContract;
+import cyanogenmod.providers.ThemesContract.PreviewColumns;
+import cyanogenmod.providers.ThemesContract.ThemesColumns;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LAUNCHER;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LOCKSCREEN;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_OVERLAYS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_STATUS_BAR;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NAVIGATION_BAR;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ICONS;
-import static android.provider.ThemesContract.ThemesColumns.MODIFIES_FONTS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ALARMS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LAUNCHER;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_LOCKSCREEN;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_OVERLAYS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_RINGTONES;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_STATUS_BAR;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_NAVIGATION_BAR;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_ICONS;
+import static cyanogenmod.providers.ThemesContract.ThemesColumns.MODIFIES_FONTS;
public class CursorLoaderHelper {
diff --git a/src/com/cyngn/theme/util/ThemedTypefaceHelper.java b/src/com/cyngn/theme/util/ThemedTypefaceHelper.java
index 68f1fb9..ce38f80 100644
--- a/src/com/cyngn/theme/util/ThemedTypefaceHelper.java
+++ b/src/com/cyngn/theme/util/ThemedTypefaceHelper.java
@@ -4,13 +4,14 @@
package com.cyngn.theme.util;
import android.content.Context;
-import android.content.pm.ThemeUtils;
import android.content.res.AssetManager;
import android.graphics.FontListParser;
import android.graphics.FontListParser.Family;
import android.graphics.Typeface;
import android.util.Log;
+import org.cyanogenmod.internal.util.ThemeUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
diff --git a/src/com/cyngn/theme/util/Utils.java b/src/com/cyngn/theme/util/Utils.java
index 8301b77..a0b910d 100644
--- a/src/com/cyngn/theme/util/Utils.java
+++ b/src/com/cyngn/theme/util/Utils.java
@@ -13,7 +13,6 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.pm.PermissionInfo;
import android.content.pm.ResolveInfo;
-import android.content.pm.ThemeUtils;
import android.content.res.AssetManager;
import android.content.res.Configuration;
import android.content.res.Resources;
@@ -26,17 +25,20 @@ import android.graphics.Point;
import android.graphics.Rect;
import android.os.RemoteException;
import android.provider.Settings;
-import android.provider.ThemesContract;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
import android.view.IWindowManager;
import android.view.WindowManager;
-
import android.view.WindowManagerGlobal;
+
import com.cyngn.theme.chooser.ChooserActivity;
+
import cyanogenmod.externalviews.KeyguardExternalView;
import cyanogenmod.providers.CMSettings;
+import cyanogenmod.providers.ThemesContract;
+
+import org.cyanogenmod.internal.util.ThemeUtils;
import java.io.File;
import java.io.FileInputStream;