cmsdk: Move sdk classes under new sdk directory.

TICKET: CYNGNOS-2299
Change-Id: Ia6c6a1ee901f4f94446c379cbceabfdfced651ef

102 files changed, 22 insertions, 22 deletions

diff --git a/Android.mk b/Android.mk
index 576b339..4eb91d5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -30,8 +30,8 @@ cm_stub_packages := cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.content:c
 # ============================================================
 include $(CLEAR_VARS)
 
-cyanogenmod_src := src/java/cyanogenmod
-cyanogenmod_internal_src := src/java/org/cyanogenmod/internal
+cyanogenmod_sdk_src := sdk/src/java/cyanogenmod
+cyanogenmod_sdk_internal_src := sdk/src/java/org/cyanogenmod/internal
 library_src := cm/lib/main/java
 
 LOCAL_MODULE := org.cyanogenmod.platform
@@ -42,8 +42,8 @@ LOCAL_JAVA_LIBRARIES := \
     org.cyanogenmod.hardware
 
 LOCAL_SRC_FILES := \
-    $(call all-java-files-under, $(cyanogenmod_src)) \
-    $(call all-java-files-under, $(cyanogenmod_internal_src)) \
+    $(call all-java-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-java-files-under, $(cyanogenmod_sdk_internal_src)) \
     $(call all-java-files-under, $(library_src))
 
 ## READ ME: ########################################################
@@ -57,8 +57,8 @@ LOCAL_SRC_FILES := \
 ##
 ## READ ME: ########################################################
 LOCAL_SRC_FILES += \
-    $(call all-Iaidl-files-under, $(cyanogenmod_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
 
 cmplat_LOCAL_INTERMEDIATE_SOURCES := \
     $(cm_platform_res)/cyanogenmod/platform/R.java \
@@ -69,7 +69,7 @@ LOCAL_INTERMEDIATE_SOURCES := \
     $(cmplat_LOCAL_INTERMEDIATE_SOURCES)
 
 # Include aidl files from cyanogenmod.app namespace as well as internal src aidl files
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
 
 include $(BUILD_JAVA_LIBRARY)
 cm_framework_module := $(LOCAL_INSTALLED_MODULE)
@@ -109,12 +109,12 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_REQUIRED_MODULES := services
 
 LOCAL_SRC_FILES := \
-    $(call all-java-files-under, $(cyanogenmod_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
+    $(call all-java-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
 
 # Included aidl files from cyanogenmod.app namespace
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
 
 cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
     $(cm_platform_res)/cyanogenmod/platform/R.java \
@@ -143,12 +143,12 @@ LOCAL_REQUIRED_MODULES := services
 LOCAL_JACK_ENABLED := disabled
 
 LOCAL_SRC_FILES := \
-    $(call all-java-files-under, $(cyanogenmod_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
+    $(call all-java-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
 
 # Included aidl files from cyanogenmod.app namespace
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
 
 cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
     $(cm_platform_res)/cyanogenmod/platform/R.java \
@@ -168,13 +168,13 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_REQUIRED_MODULES := services
 
 LOCAL_SRC_FILES := \
-    $(call all-java-files-under, $(cyanogenmod_src)) \
-    $(call all-java-files-under, $(cyanogenmod_internal_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_src)) \
-    $(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
+    $(call all-java-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-java-files-under, $(cyanogenmod_sdk_internal_src)) \
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
 
 # Included aidl files from cyanogenmod.app namespace
-LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
+LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
 
 cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
     $(cm_platform_res)/cyanogenmod/platform/R.java \
@@ -192,8 +192,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 # ===========================================================
 # Common Droiddoc vars
 cmplat_docs_src_files := \
-    $(call all-java-files-under, $(cyanogenmod_src)) \
-    $(call all-html-files-under, $(cyanogenmod_src))
+    $(call all-java-files-under, $(cyanogenmod_sdk_src)) \
+    $(call all-html-files-under, $(cyanogenmod_sdk_src))
 
 cmplat_docs_java_libraries := \
     org.cyanogenmod.platform.sdk
diff --git a/res/res/values/attrs.xml b/sdk/res/res/values/attrs.xml
index b9ee43b..b9ee43b 100644
--- a/res/res/values/attrs.xml
+++ b/sdk/res/res/values/attrs.xml
diff --git a/src/java/cyanogenmod/alarmclock/ClockContract.java b/sdk/src/java/cyanogenmod/alarmclock/ClockContract.java
index 63a1d27..63a1d27 100644
--- a/src/java/cyanogenmod/alarmclock/ClockContract.java
+++ b/sdk/src/java/cyanogenmod/alarmclock/ClockContract.java
diff --git a/src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java b/sdk/src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java
index 76508a9..76508a9 100644
--- a/src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java
+++ b/sdk/src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java
diff --git a/src/java/cyanogenmod/app/BaseLiveLockManagerService.java b/sdk/src/java/cyanogenmod/app/BaseLiveLockManagerService.java
index feae94f..feae94f 100644
--- a/src/java/cyanogenmod/app/BaseLiveLockManagerService.java
+++ b/sdk/src/java/cyanogenmod/app/BaseLiveLockManagerService.java
diff --git a/src/java/cyanogenmod/app/CMContextConstants.java b/sdk/src/java/cyanogenmod/app/CMContextConstants.java
index 98171b8..98171b8 100644
--- a/src/java/cyanogenmod/app/CMContextConstants.java
+++ b/sdk/src/java/cyanogenmod/app/CMContextConstants.java
diff --git a/src/java/cyanogenmod/app/CMStatusBarManager.java b/sdk/src/java/cyanogenmod/app/CMStatusBarManager.java
index d696a82..d696a82 100644
--- a/src/java/cyanogenmod/app/CMStatusBarManager.java
+++ b/sdk/src/java/cyanogenmod/app/CMStatusBarManager.java
diff --git a/src/java/cyanogenmod/app/CMTelephonyManager.java b/sdk/src/java/cyanogenmod/app/CMTelephonyManager.java
index 4285f44..4285f44 100644
--- a/src/java/cyanogenmod/app/CMTelephonyManager.java
+++ b/sdk/src/java/cyanogenmod/app/CMTelephonyManager.java
diff --git a/src/java/cyanogenmod/app/CustomTile.aidl b/sdk/src/java/cyanogenmod/app/CustomTile.aidl
index 1a35ad0..1a35ad0 100644
--- a/src/java/cyanogenmod/app/CustomTile.aidl
+++ b/sdk/src/java/cyanogenmod/app/CustomTile.aidl
diff --git a/src/java/cyanogenmod/app/CustomTile.java b/sdk/src/java/cyanogenmod/app/CustomTile.java
index dee8c37..dee8c37 100644
--- a/src/java/cyanogenmod/app/CustomTile.java
+++ b/sdk/src/java/cyanogenmod/app/CustomTile.java
diff --git a/src/java/cyanogenmod/app/CustomTileListenerService.java b/sdk/src/java/cyanogenmod/app/CustomTileListenerService.java
index 2c8036f..2c8036f 100644
--- a/src/java/cyanogenmod/app/CustomTileListenerService.java
+++ b/sdk/src/java/cyanogenmod/app/CustomTileListenerService.java
diff --git a/src/java/cyanogenmod/app/ICMStatusBarManager.aidl b/sdk/src/java/cyanogenmod/app/ICMStatusBarManager.aidl
index 62283a5..62283a5 100644
--- a/src/java/cyanogenmod/app/ICMStatusBarManager.aidl
+++ b/sdk/src/java/cyanogenmod/app/ICMStatusBarManager.aidl
diff --git a/src/java/cyanogenmod/app/ICMTelephonyManager.aidl b/sdk/src/java/cyanogenmod/app/ICMTelephonyManager.aidl
index 743d61c..743d61c 100644
--- a/src/java/cyanogenmod/app/ICMTelephonyManager.aidl
+++ b/sdk/src/java/cyanogenmod/app/ICMTelephonyManager.aidl
diff --git a/src/java/cyanogenmod/app/ICustomTileListener.aidl b/sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl
index 9f21f52..9f21f52 100644
--- a/src/java/cyanogenmod/app/ICustomTileListener.aidl
+++ b/sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl
diff --git a/src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl b/sdk/src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl
index 48e7f36..48e7f36 100644
--- a/src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl
+++ b/sdk/src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl
diff --git a/src/java/cyanogenmod/app/ILiveLockScreenManager.aidl b/sdk/src/java/cyanogenmod/app/ILiveLockScreenManager.aidl
index 15142c1..15142c1 100644
--- a/src/java/cyanogenmod/app/ILiveLockScreenManager.aidl
+++ b/sdk/src/java/cyanogenmod/app/ILiveLockScreenManager.aidl
diff --git a/src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl b/sdk/src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl
index 933eb97..933eb97 100644
--- a/src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl
+++ b/sdk/src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl
diff --git a/src/java/cyanogenmod/app/IPartnerInterface.aidl b/sdk/src/java/cyanogenmod/app/IPartnerInterface.aidl
index 1b02dd1..1b02dd1 100644
--- a/src/java/cyanogenmod/app/IPartnerInterface.aidl
+++ b/sdk/src/java/cyanogenmod/app/IPartnerInterface.aidl
diff --git a/src/java/cyanogenmod/app/IProfileManager.aidl b/sdk/src/java/cyanogenmod/app/IProfileManager.aidl
index 091ba55..091ba55 100644
--- a/src/java/cyanogenmod/app/IProfileManager.aidl
+++ b/sdk/src/java/cyanogenmod/app/IProfileManager.aidl
diff --git a/src/java/cyanogenmod/app/LiveLockScreenInfo.aidl b/sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.aidl
index bffa3b0..bffa3b0 100644
--- a/src/java/cyanogenmod/app/LiveLockScreenInfo.aidl
+++ b/sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.aidl
diff --git a/src/java/cyanogenmod/app/LiveLockScreenInfo.java b/sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.java
index 5ac2220..5ac2220 100644
--- a/src/java/cyanogenmod/app/LiveLockScreenInfo.java
+++ b/sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.java
diff --git a/src/java/cyanogenmod/app/LiveLockScreenManager.java b/sdk/src/java/cyanogenmod/app/LiveLockScreenManager.java
index c5fa4ce..c5fa4ce 100644
--- a/src/java/cyanogenmod/app/LiveLockScreenManager.java
+++ b/sdk/src/java/cyanogenmod/app/LiveLockScreenManager.java
diff --git a/src/java/cyanogenmod/app/PartnerInterface.java b/sdk/src/java/cyanogenmod/app/PartnerInterface.java
index a7661ff..a7661ff 100644
--- a/src/java/cyanogenmod/app/PartnerInterface.java
+++ b/sdk/src/java/cyanogenmod/app/PartnerInterface.java
diff --git a/src/java/cyanogenmod/app/Profile.aidl b/sdk/src/java/cyanogenmod/app/Profile.aidl
index ff6c54e..ff6c54e 100644
--- a/src/java/cyanogenmod/app/Profile.aidl
+++ b/sdk/src/java/cyanogenmod/app/Profile.aidl
diff --git a/src/java/cyanogenmod/app/Profile.java b/sdk/src/java/cyanogenmod/app/Profile.java
index 9a4666d..9a4666d 100755
--- a/src/java/cyanogenmod/app/Profile.java
+++ b/sdk/src/java/cyanogenmod/app/Profile.java
diff --git a/src/java/cyanogenmod/app/ProfileGroup.java b/sdk/src/java/cyanogenmod/app/ProfileGroup.java
index 56ec507..56ec507 100644
--- a/src/java/cyanogenmod/app/ProfileGroup.java
+++ b/sdk/src/java/cyanogenmod/app/ProfileGroup.java
diff --git a/src/java/cyanogenmod/app/ProfileManager.java b/sdk/src/java/cyanogenmod/app/ProfileManager.java
index c2470cb..c2470cb 100644
--- a/src/java/cyanogenmod/app/ProfileManager.java
+++ b/sdk/src/java/cyanogenmod/app/ProfileManager.java
diff --git a/src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl b/sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl
index 96cfb6a..96cfb6a 100644
--- a/src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl
+++ b/sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl
diff --git a/src/java/cyanogenmod/app/StatusBarPanelCustomTile.java b/sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.java
index 7710e5a..7710e5a 100644
--- a/src/java/cyanogenmod/app/StatusBarPanelCustomTile.java
+++ b/sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.java
diff --git a/src/java/cyanogenmod/app/ThemeComponent.java b/sdk/src/java/cyanogenmod/app/ThemeComponent.java
index d3f6625..d3f6625 100644
--- a/src/java/cyanogenmod/app/ThemeComponent.java
+++ b/sdk/src/java/cyanogenmod/app/ThemeComponent.java
diff --git a/src/java/cyanogenmod/app/ThemeVersion.java b/sdk/src/java/cyanogenmod/app/ThemeVersion.java
index b9846c6..b9846c6 100644
--- a/src/java/cyanogenmod/app/ThemeVersion.java
+++ b/sdk/src/java/cyanogenmod/app/ThemeVersion.java
diff --git a/src/java/cyanogenmod/app/suggest/AppSuggestManager.java b/sdk/src/java/cyanogenmod/app/suggest/AppSuggestManager.java
index 667eaa7..667eaa7 100644
--- a/src/java/cyanogenmod/app/suggest/AppSuggestManager.java
+++ b/sdk/src/java/cyanogenmod/app/suggest/AppSuggestManager.java
diff --git a/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.aidl b/sdk/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.aidl
index 7ab8584..7ab8584 100644
--- a/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.aidl
+++ b/sdk/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.aidl
diff --git a/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.java b/sdk/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.java
index 17e40b9..17e40b9 100644
--- a/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.java
+++ b/sdk/src/java/cyanogenmod/app/suggest/ApplicationSuggestion.java
diff --git a/src/java/cyanogenmod/app/suggest/IAppSuggestManager.aidl b/sdk/src/java/cyanogenmod/app/suggest/IAppSuggestManager.aidl
index 68ab87f..68ab87f 100644
--- a/src/java/cyanogenmod/app/suggest/IAppSuggestManager.aidl
+++ b/sdk/src/java/cyanogenmod/app/suggest/IAppSuggestManager.aidl
diff --git a/src/java/cyanogenmod/app/suggest/IAppSuggestProvider.aidl b/sdk/src/java/cyanogenmod/app/suggest/IAppSuggestProvider.aidl
index 759880d..759880d 100644
--- a/src/java/cyanogenmod/app/suggest/IAppSuggestProvider.aidl
+++ b/sdk/src/java/cyanogenmod/app/suggest/IAppSuggestProvider.aidl
diff --git a/src/java/cyanogenmod/content/Intent.java b/sdk/src/java/cyanogenmod/content/Intent.java
index 6369b7c..6369b7c 100644
--- a/src/java/cyanogenmod/content/Intent.java
+++ b/sdk/src/java/cyanogenmod/content/Intent.java
diff --git a/src/java/cyanogenmod/externalviews/ExternalView.java b/sdk/src/java/cyanogenmod/externalviews/ExternalView.java
index 3c3adb4..3c3adb4 100644
--- a/src/java/cyanogenmod/externalviews/ExternalView.java
+++ b/sdk/src/java/cyanogenmod/externalviews/ExternalView.java
diff --git a/src/java/cyanogenmod/externalviews/ExternalViewProperties.java b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java
index 2b4404d..2b4404d 100644
--- a/src/java/cyanogenmod/externalviews/ExternalViewProperties.java
+++ b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java
diff --git a/src/java/cyanogenmod/externalviews/ExternalViewProviderService.java b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProviderService.java
index b15e01a..b15e01a 100644
--- a/src/java/cyanogenmod/externalviews/ExternalViewProviderService.java
+++ b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProviderService.java
diff --git a/src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl b/sdk/src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl
index e05215f..e05215f 100644
--- a/src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl
+++ b/sdk/src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl
diff --git a/src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl b/sdk/src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl
index 75a8b35..75a8b35 100644
--- a/src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl
+++ b/sdk/src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl
diff --git a/src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl b/sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl
index c9d75e2..c9d75e2 100644
--- a/src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl
+++ b/sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl
diff --git a/src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl b/sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl
index a708984..a708984 100644
--- a/src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl
+++ b/sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl
diff --git a/src/java/cyanogenmod/externalviews/KeyguardExternalView.java b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java
index 9f4059a..9f4059a 100644
--- a/src/java/cyanogenmod/externalviews/KeyguardExternalView.java
+++ b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java
diff --git a/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java
index 4c69a0a..4c69a0a 100644
--- a/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java
+++ b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java
diff --git a/src/java/cyanogenmod/hardware/CMHardwareManager.java b/sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java
index 5bfb858..5bfb858 100644
--- a/src/java/cyanogenmod/hardware/CMHardwareManager.java
+++ b/sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java
diff --git a/src/java/cyanogenmod/hardware/DisplayMode.aidl b/sdk/src/java/cyanogenmod/hardware/DisplayMode.aidl
index a4f9163..a4f9163 100644
--- a/src/java/cyanogenmod/hardware/DisplayMode.aidl
+++ b/sdk/src/java/cyanogenmod/hardware/DisplayMode.aidl
diff --git a/src/java/cyanogenmod/hardware/DisplayMode.java b/sdk/src/java/cyanogenmod/hardware/DisplayMode.java
index 77172b8..77172b8 100644
--- a/src/java/cyanogenmod/hardware/DisplayMode.java
+++ b/sdk/src/java/cyanogenmod/hardware/DisplayMode.java
diff --git a/src/java/cyanogenmod/hardware/ICMHardwareService.aidl b/sdk/src/java/cyanogenmod/hardware/ICMHardwareService.aidl
index a1ae65b..a1ae65b 100644
--- a/src/java/cyanogenmod/hardware/ICMHardwareService.aidl
+++ b/sdk/src/java/cyanogenmod/hardware/ICMHardwareService.aidl
diff --git a/src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl b/sdk/src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl
index 1a53af2..1a53af2 100644
--- a/src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl
+++ b/sdk/src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl
diff --git a/src/java/cyanogenmod/hardware/ThermalListenerCallback.java b/sdk/src/java/cyanogenmod/hardware/ThermalListenerCallback.java
index 3ef312d..3ef312d 100644
--- a/src/java/cyanogenmod/hardware/ThermalListenerCallback.java
+++ b/sdk/src/java/cyanogenmod/hardware/ThermalListenerCallback.java
diff --git a/src/java/cyanogenmod/media/MediaRecorder.java b/sdk/src/java/cyanogenmod/media/MediaRecorder.java
index c28cc93..c28cc93 100644
--- a/src/java/cyanogenmod/media/MediaRecorder.java
+++ b/sdk/src/java/cyanogenmod/media/MediaRecorder.java
diff --git a/src/java/cyanogenmod/os/Build.java b/sdk/src/java/cyanogenmod/os/Build.java
index ce7b8fb..ce7b8fb 100644
--- a/src/java/cyanogenmod/os/Build.java
+++ b/sdk/src/java/cyanogenmod/os/Build.java
diff --git a/src/java/cyanogenmod/os/Concierge.java b/sdk/src/java/cyanogenmod/os/Concierge.java
index 2463dec..2463dec 100644
--- a/src/java/cyanogenmod/os/Concierge.java
+++ b/sdk/src/java/cyanogenmod/os/Concierge.java
diff --git a/src/java/cyanogenmod/power/IPerformanceManager.aidl b/sdk/src/java/cyanogenmod/power/IPerformanceManager.aidl
index bf44ac9..bf44ac9 100644
--- a/src/java/cyanogenmod/power/IPerformanceManager.aidl
+++ b/sdk/src/java/cyanogenmod/power/IPerformanceManager.aidl
diff --git a/src/java/cyanogenmod/power/PerformanceManager.java b/sdk/src/java/cyanogenmod/power/PerformanceManager.java
index 9b44399..9b44399 100644
--- a/src/java/cyanogenmod/power/PerformanceManager.java
+++ b/sdk/src/java/cyanogenmod/power/PerformanceManager.java
diff --git a/src/java/cyanogenmod/power/PerformanceManagerInternal.java b/sdk/src/java/cyanogenmod/power/PerformanceManagerInternal.java
index 67f158a..67f158a 100644
--- a/src/java/cyanogenmod/power/PerformanceManagerInternal.java
+++ b/sdk/src/java/cyanogenmod/power/PerformanceManagerInternal.java
diff --git a/src/java/cyanogenmod/profiles/AirplaneModeSettings.java b/sdk/src/java/cyanogenmod/profiles/AirplaneModeSettings.java
index a9b828f..a9b828f 100644
--- a/src/java/cyanogenmod/profiles/AirplaneModeSettings.java
+++ b/sdk/src/java/cyanogenmod/profiles/AirplaneModeSettings.java
diff --git a/src/java/cyanogenmod/profiles/BrightnessSettings.java b/sdk/src/java/cyanogenmod/profiles/BrightnessSettings.java
index 0786a72..0786a72 100644
--- a/src/java/cyanogenmod/profiles/BrightnessSettings.java
+++ b/sdk/src/java/cyanogenmod/profiles/BrightnessSettings.java
diff --git a/src/java/cyanogenmod/profiles/ConnectionSettings.java b/sdk/src/java/cyanogenmod/profiles/ConnectionSettings.java
index 19954dd..19954dd 100644
--- a/src/java/cyanogenmod/profiles/ConnectionSettings.java
+++ b/sdk/src/java/cyanogenmod/profiles/ConnectionSettings.java
diff --git a/src/java/cyanogenmod/profiles/LockSettings.java b/sdk/src/java/cyanogenmod/profiles/LockSettings.java
index 2be3725..2be3725 100644
--- a/src/java/cyanogenmod/profiles/LockSettings.java
+++ b/sdk/src/java/cyanogenmod/profiles/LockSettings.java
diff --git a/src/java/cyanogenmod/profiles/RingModeSettings.java b/sdk/src/java/cyanogenmod/profiles/RingModeSettings.java
index bab74ac..bab74ac 100644
--- a/src/java/cyanogenmod/profiles/RingModeSettings.java
+++ b/sdk/src/java/cyanogenmod/profiles/RingModeSettings.java
diff --git a/src/java/cyanogenmod/profiles/StreamSettings.java b/sdk/src/java/cyanogenmod/profiles/StreamSettings.java
index 9ce9415..9ce9415 100644
--- a/src/java/cyanogenmod/profiles/StreamSettings.java
+++ b/sdk/src/java/cyanogenmod/profiles/StreamSettings.java
diff --git a/src/java/cyanogenmod/providers/CMSettings.java b/sdk/src/java/cyanogenmod/providers/CMSettings.java
index 47cc524..47cc524 100644
--- a/src/java/cyanogenmod/providers/CMSettings.java
+++ b/sdk/src/java/cyanogenmod/providers/CMSettings.java
diff --git a/src/java/cyanogenmod/providers/DataUsageContract.java b/sdk/src/java/cyanogenmod/providers/DataUsageContract.java
index 2371cd7..2371cd7 100644
--- a/src/java/cyanogenmod/providers/DataUsageContract.java
+++ b/sdk/src/java/cyanogenmod/providers/DataUsageContract.java
diff --git a/src/java/cyanogenmod/providers/ThemesContract.java b/sdk/src/java/cyanogenmod/providers/ThemesContract.java
index 4cdfeb9..4cdfeb9 100644
--- a/src/java/cyanogenmod/providers/ThemesContract.java
+++ b/sdk/src/java/cyanogenmod/providers/ThemesContract.java
diff --git a/src/java/cyanogenmod/providers/WeatherContract.java b/sdk/src/java/cyanogenmod/providers/WeatherContract.java
index e8e3726..e8e3726 100644
--- a/src/java/cyanogenmod/providers/WeatherContract.java
+++ b/sdk/src/java/cyanogenmod/providers/WeatherContract.java
diff --git a/src/java/cyanogenmod/themes/IThemeChangeListener.aidl b/sdk/src/java/cyanogenmod/themes/IThemeChangeListener.aidl
index 0700eb6..0700eb6 100644
--- a/src/java/cyanogenmod/themes/IThemeChangeListener.aidl
+++ b/sdk/src/java/cyanogenmod/themes/IThemeChangeListener.aidl
diff --git a/src/java/cyanogenmod/themes/IThemeProcessingListener.aidl b/sdk/src/java/cyanogenmod/themes/IThemeProcessingListener.aidl
index 648e1a9..648e1a9 100644
--- a/src/java/cyanogenmod/themes/IThemeProcessingListener.aidl
+++ b/sdk/src/java/cyanogenmod/themes/IThemeProcessingListener.aidl
diff --git a/src/java/cyanogenmod/themes/IThemeService.aidl b/sdk/src/java/cyanogenmod/themes/IThemeService.aidl
index fa186e9..fa186e9 100644
--- a/src/java/cyanogenmod/themes/IThemeService.aidl
+++ b/sdk/src/java/cyanogenmod/themes/IThemeService.aidl
diff --git a/src/java/cyanogenmod/themes/ThemeChangeRequest.aidl b/sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.aidl
index e1d9e4f..e1d9e4f 100644
--- a/src/java/cyanogenmod/themes/ThemeChangeRequest.aidl
+++ b/sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.aidl
diff --git a/src/java/cyanogenmod/themes/ThemeChangeRequest.java b/sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.java
index f8eeeb5..f8eeeb5 100644
--- a/src/java/cyanogenmod/themes/ThemeChangeRequest.java
+++ b/sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.java
diff --git a/src/java/cyanogenmod/themes/ThemeManager.java b/sdk/src/java/cyanogenmod/themes/ThemeManager.java
index 5fbbde7..5fbbde7 100644
--- a/src/java/cyanogenmod/themes/ThemeManager.java
+++ b/sdk/src/java/cyanogenmod/themes/ThemeManager.java
diff --git a/src/java/cyanogenmod/util/ColorUtils.java b/sdk/src/java/cyanogenmod/util/ColorUtils.java
index 0142396..0142396 100644
--- a/src/java/cyanogenmod/util/ColorUtils.java
+++ b/sdk/src/java/cyanogenmod/util/ColorUtils.java
diff --git a/src/java/cyanogenmod/weather/CMWeatherManager.java b/sdk/src/java/cyanogenmod/weather/CMWeatherManager.java
index 32eab52..32eab52 100644
--- a/src/java/cyanogenmod/weather/CMWeatherManager.java
+++ b/sdk/src/java/cyanogenmod/weather/CMWeatherManager.java
diff --git a/src/java/cyanogenmod/weather/ICMWeatherManager.aidl b/sdk/src/java/cyanogenmod/weather/ICMWeatherManager.aidl
index 21e1d26..21e1d26 100644
--- a/src/java/cyanogenmod/weather/ICMWeatherManager.aidl
+++ b/sdk/src/java/cyanogenmod/weather/ICMWeatherManager.aidl
diff --git a/src/java/cyanogenmod/weather/IRequestInfoListener.aidl b/sdk/src/java/cyanogenmod/weather/IRequestInfoListener.aidl
index 553da71..553da71 100644
--- a/src/java/cyanogenmod/weather/IRequestInfoListener.aidl
+++ b/sdk/src/java/cyanogenmod/weather/IRequestInfoListener.aidl
diff --git a/src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl b/sdk/src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl
index 7c823b6..7c823b6 100644
--- a/src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl
+++ b/sdk/src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl
diff --git a/src/java/cyanogenmod/weather/RequestInfo.aidl b/sdk/src/java/cyanogenmod/weather/RequestInfo.aidl
index 5e53b93..5e53b93 100644
--- a/src/java/cyanogenmod/weather/RequestInfo.aidl
+++ b/sdk/src/java/cyanogenmod/weather/RequestInfo.aidl
diff --git a/src/java/cyanogenmod/weather/RequestInfo.java b/sdk/src/java/cyanogenmod/weather/RequestInfo.java
index 353b5fd..353b5fd 100644
--- a/src/java/cyanogenmod/weather/RequestInfo.java
+++ b/sdk/src/java/cyanogenmod/weather/RequestInfo.java
diff --git a/src/java/cyanogenmod/weather/WeatherInfo.aidl b/sdk/src/java/cyanogenmod/weather/WeatherInfo.aidl
index ffff02c..ffff02c 100644
--- a/src/java/cyanogenmod/weather/WeatherInfo.aidl
+++ b/sdk/src/java/cyanogenmod/weather/WeatherInfo.aidl
diff --git a/src/java/cyanogenmod/weather/WeatherInfo.java b/sdk/src/java/cyanogenmod/weather/WeatherInfo.java
index 7d8686e..7d8686e 100755
--- a/src/java/cyanogenmod/weather/WeatherInfo.java
+++ b/sdk/src/java/cyanogenmod/weather/WeatherInfo.java
diff --git a/src/java/cyanogenmod/weather/WeatherLocation.aidl b/sdk/src/java/cyanogenmod/weather/WeatherLocation.aidl
index 23f7b24..23f7b24 100644
--- a/src/java/cyanogenmod/weather/WeatherLocation.aidl
+++ b/sdk/src/java/cyanogenmod/weather/WeatherLocation.aidl
diff --git a/src/java/cyanogenmod/weather/WeatherLocation.java b/sdk/src/java/cyanogenmod/weather/WeatherLocation.java
index 3afcd8e..3afcd8e 100644
--- a/src/java/cyanogenmod/weather/WeatherLocation.java
+++ b/sdk/src/java/cyanogenmod/weather/WeatherLocation.java
diff --git a/src/java/cyanogenmod/weather/util/WeatherUtils.java b/sdk/src/java/cyanogenmod/weather/util/WeatherUtils.java
index c89213b..c89213b 100644
--- a/src/java/cyanogenmod/weather/util/WeatherUtils.java
+++ b/sdk/src/java/cyanogenmod/weather/util/WeatherUtils.java
diff --git a/src/java/cyanogenmod/weatherservice/IWeatherProviderService.aidl b/sdk/src/java/cyanogenmod/weatherservice/IWeatherProviderService.aidl
index d9eceb3..d9eceb3 100644
--- a/src/java/cyanogenmod/weatherservice/IWeatherProviderService.aidl
+++ b/sdk/src/java/cyanogenmod/weatherservice/IWeatherProviderService.aidl
diff --git a/src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl b/sdk/src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl
index a4baa4c..a4baa4c 100644
--- a/src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl
+++ b/sdk/src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl
diff --git a/src/java/cyanogenmod/weatherservice/ServiceRequest.java b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequest.java
index e43218d..e43218d 100644
--- a/src/java/cyanogenmod/weatherservice/ServiceRequest.java
+++ b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequest.java
diff --git a/src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl
index 669ece5..669ece5 100644
--- a/src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl
+++ b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl
diff --git a/src/java/cyanogenmod/weatherservice/ServiceRequestResult.java b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.java
index 07f4cd9..07f4cd9 100644
--- a/src/java/cyanogenmod/weatherservice/ServiceRequestResult.java
+++ b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.java
diff --git a/src/java/cyanogenmod/weatherservice/WeatherProviderService.java b/sdk/src/java/cyanogenmod/weatherservice/WeatherProviderService.java
index 759d5fc..759d5fc 100644
--- a/src/java/cyanogenmod/weatherservice/WeatherProviderService.java
+++ b/sdk/src/java/cyanogenmod/weatherservice/WeatherProviderService.java
diff --git a/src/java/org/cyanogenmod/internal/logging/CMMetricsLogger.java b/sdk/src/java/org/cyanogenmod/internal/logging/CMMetricsLogger.java
index e3303d5..e3303d5 100644
--- a/src/java/org/cyanogenmod/internal/logging/CMMetricsLogger.java
+++ b/sdk/src/java/org/cyanogenmod/internal/logging/CMMetricsLogger.java
diff --git a/src/java/org/cyanogenmod/internal/statusbar/ExternalQuickSettingsRecord.java b/sdk/src/java/org/cyanogenmod/internal/statusbar/ExternalQuickSettingsRecord.java
index 05f8edf..05f8edf 100644
--- a/src/java/org/cyanogenmod/internal/statusbar/ExternalQuickSettingsRecord.java
+++ b/sdk/src/java/org/cyanogenmod/internal/statusbar/ExternalQuickSettingsRecord.java
diff --git a/src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl b/sdk/src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl
index 90e04de..90e04de 100644
--- a/src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl
+++ b/sdk/src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl
diff --git a/src/java/org/cyanogenmod/internal/themes/IIconCacheManager.aidl b/sdk/src/java/org/cyanogenmod/internal/themes/IIconCacheManager.aidl
index c69e082..c69e082 100644
--- a/src/java/org/cyanogenmod/internal/themes/IIconCacheManager.aidl
+++ b/sdk/src/java/org/cyanogenmod/internal/themes/IIconCacheManager.aidl
diff --git a/src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java b/sdk/src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java
index 75ab0b3..75ab0b3 100644
--- a/src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java
+++ b/sdk/src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java
diff --git a/src/java/org/cyanogenmod/internal/util/ImageUtils.java b/sdk/src/java/org/cyanogenmod/internal/util/ImageUtils.java
index c67c23c..c67c23c 100644
--- a/src/java/org/cyanogenmod/internal/util/ImageUtils.java
+++ b/sdk/src/java/org/cyanogenmod/internal/util/ImageUtils.java
diff --git a/src/java/org/cyanogenmod/internal/util/QSConstants.java b/sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java
index d47e683..d47e683 100644
--- a/src/java/org/cyanogenmod/internal/util/QSConstants.java
+++ b/sdk/src/java/org/cyanogenmod/internal/util/QSConstants.java
diff --git a/src/java/org/cyanogenmod/internal/util/QSUtils.java b/sdk/src/java/org/cyanogenmod/internal/util/QSUtils.java
index 6aedaf8..6aedaf8 100644
--- a/src/java/org/cyanogenmod/internal/util/QSUtils.java
+++ b/sdk/src/java/org/cyanogenmod/internal/util/QSUtils.java
diff --git a/src/java/org/cyanogenmod/internal/util/ScreenType.java b/sdk/src/java/org/cyanogenmod/internal/util/ScreenType.java
index 23bd9ad..23bd9ad 100644
--- a/src/java/org/cyanogenmod/internal/util/ScreenType.java
+++ b/sdk/src/java/org/cyanogenmod/internal/util/ScreenType.java
diff --git a/src/java/org/cyanogenmod/internal/util/ThemeUtils.java b/sdk/src/java/org/cyanogenmod/internal/util/ThemeUtils.java
index ef51ced..ef51ced 100644
--- a/src/java/org/cyanogenmod/internal/util/ThemeUtils.java
+++ b/sdk/src/java/org/cyanogenmod/internal/util/ThemeUtils.java