Themes: Refactor themes to CMSDK [1/6]

Change-Id: I3688b37342eddcfceeabaae982085884e9bc63ee
TICKET: CYNGNOS-2126

2 files changed, 9 insertions, 5 deletions

diff --git a/cmds/tm/Android.mk b/cmds/tm/Android.mk
index 34a41dd..97e8ee4 100644
--- a/cmds/tm/Android.mk
+++ b/cmds/tm/Android.mk
@@ -4,6 +4,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
+LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.internal
 LOCAL_MODULE := tm
 include $(BUILD_JAVA_LIBRARY)
 
diff --git a/cmds/tm/src/com/android/commands/tm/Tm.java b/cmds/tm/src/com/android/commands/tm/Tm.java
index af1ac75..0ba5cb9 100644
--- a/cmds/tm/src/com/android/commands/tm/Tm.java
+++ b/cmds/tm/src/com/android/commands/tm/Tm.java
@@ -21,17 +21,19 @@ package com.android.commands.tm;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageInfo;
 import android.content.pm.ParceledListSlice;
-import android.content.pm.ThemeUtils;
-import android.content.res.IThemeService;
-import android.content.res.ThemeChangeRequest;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.util.AndroidException;
 import com.android.internal.os.BaseCommand;
 
+import cyanogenmod.app.CMContextConstants;
+import cyanogenmod.themes.IThemeService;
+import cyanogenmod.themes.ThemeChangeRequest;
+
+import org.cyanogenmod.internal.util.ThemeUtils;
+
 import java.io.PrintStream;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -81,7 +83,8 @@ public class Tm extends BaseCommand {
     }
 
     public void onRun() throws Exception {
-        mTs = IThemeService.Stub.asInterface(ServiceManager.getService("themes"));
+        mTs = IThemeService.Stub.asInterface(ServiceManager
+                .getService(CMContextConstants.CM_THEME_SERVICE));
         if (mTs == null) {
             System.err.println(NO_SYSTEM_ERROR_CODE);
             throw new AndroidException("Can't connect to theme service; is the system running?");