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 similarity index 100% rename from res/res/values/attrs.xml rename to sdk/res/res/values/attrs.xml diff --git a/src/java/cyanogenmod/alarmclock/ClockContract.java b/sdk/src/java/cyanogenmod/alarmclock/ClockContract.java similarity index 100% rename from src/java/cyanogenmod/alarmclock/ClockContract.java rename to sdk/src/java/cyanogenmod/alarmclock/ClockContract.java diff --git a/src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java b/sdk/src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java similarity index 100% rename from src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java rename to sdk/src/java/cyanogenmod/alarmclock/CyanogenModAlarmClock.java diff --git a/src/java/cyanogenmod/app/BaseLiveLockManagerService.java b/sdk/src/java/cyanogenmod/app/BaseLiveLockManagerService.java similarity index 100% rename from src/java/cyanogenmod/app/BaseLiveLockManagerService.java rename to sdk/src/java/cyanogenmod/app/BaseLiveLockManagerService.java diff --git a/src/java/cyanogenmod/app/CMContextConstants.java b/sdk/src/java/cyanogenmod/app/CMContextConstants.java similarity index 100% rename from src/java/cyanogenmod/app/CMContextConstants.java rename to sdk/src/java/cyanogenmod/app/CMContextConstants.java diff --git a/src/java/cyanogenmod/app/CMStatusBarManager.java b/sdk/src/java/cyanogenmod/app/CMStatusBarManager.java similarity index 100% rename from src/java/cyanogenmod/app/CMStatusBarManager.java rename to sdk/src/java/cyanogenmod/app/CMStatusBarManager.java diff --git a/src/java/cyanogenmod/app/CMTelephonyManager.java b/sdk/src/java/cyanogenmod/app/CMTelephonyManager.java similarity index 100% rename from src/java/cyanogenmod/app/CMTelephonyManager.java rename to sdk/src/java/cyanogenmod/app/CMTelephonyManager.java diff --git a/src/java/cyanogenmod/app/CustomTile.aidl b/sdk/src/java/cyanogenmod/app/CustomTile.aidl similarity index 100% rename from src/java/cyanogenmod/app/CustomTile.aidl rename to sdk/src/java/cyanogenmod/app/CustomTile.aidl diff --git a/src/java/cyanogenmod/app/CustomTile.java b/sdk/src/java/cyanogenmod/app/CustomTile.java similarity index 100% rename from src/java/cyanogenmod/app/CustomTile.java rename to sdk/src/java/cyanogenmod/app/CustomTile.java diff --git a/src/java/cyanogenmod/app/CustomTileListenerService.java b/sdk/src/java/cyanogenmod/app/CustomTileListenerService.java similarity index 100% rename from src/java/cyanogenmod/app/CustomTileListenerService.java rename to sdk/src/java/cyanogenmod/app/CustomTileListenerService.java diff --git a/src/java/cyanogenmod/app/ICMStatusBarManager.aidl b/sdk/src/java/cyanogenmod/app/ICMStatusBarManager.aidl similarity index 100% rename from src/java/cyanogenmod/app/ICMStatusBarManager.aidl rename to sdk/src/java/cyanogenmod/app/ICMStatusBarManager.aidl diff --git a/src/java/cyanogenmod/app/ICMTelephonyManager.aidl b/sdk/src/java/cyanogenmod/app/ICMTelephonyManager.aidl similarity index 100% rename from src/java/cyanogenmod/app/ICMTelephonyManager.aidl rename to sdk/src/java/cyanogenmod/app/ICMTelephonyManager.aidl diff --git a/src/java/cyanogenmod/app/ICustomTileListener.aidl b/sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl similarity index 100% rename from src/java/cyanogenmod/app/ICustomTileListener.aidl rename to sdk/src/java/cyanogenmod/app/ICustomTileListener.aidl diff --git a/src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl b/sdk/src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl similarity index 100% rename from src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl rename to sdk/src/java/cyanogenmod/app/ILiveLockScreenChangeListener.aidl diff --git a/src/java/cyanogenmod/app/ILiveLockScreenManager.aidl b/sdk/src/java/cyanogenmod/app/ILiveLockScreenManager.aidl similarity index 100% rename from src/java/cyanogenmod/app/ILiveLockScreenManager.aidl rename to sdk/src/java/cyanogenmod/app/ILiveLockScreenManager.aidl diff --git a/src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl b/sdk/src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl similarity index 100% rename from src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl rename to sdk/src/java/cyanogenmod/app/ILiveLockScreenManagerProvider.aidl diff --git a/src/java/cyanogenmod/app/IPartnerInterface.aidl b/sdk/src/java/cyanogenmod/app/IPartnerInterface.aidl similarity index 100% rename from src/java/cyanogenmod/app/IPartnerInterface.aidl rename to sdk/src/java/cyanogenmod/app/IPartnerInterface.aidl diff --git a/src/java/cyanogenmod/app/IProfileManager.aidl b/sdk/src/java/cyanogenmod/app/IProfileManager.aidl similarity index 100% rename from src/java/cyanogenmod/app/IProfileManager.aidl rename to sdk/src/java/cyanogenmod/app/IProfileManager.aidl diff --git a/src/java/cyanogenmod/app/LiveLockScreenInfo.aidl b/sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.aidl similarity index 100% rename from src/java/cyanogenmod/app/LiveLockScreenInfo.aidl rename to sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.aidl diff --git a/src/java/cyanogenmod/app/LiveLockScreenInfo.java b/sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.java similarity index 100% rename from src/java/cyanogenmod/app/LiveLockScreenInfo.java rename to sdk/src/java/cyanogenmod/app/LiveLockScreenInfo.java diff --git a/src/java/cyanogenmod/app/LiveLockScreenManager.java b/sdk/src/java/cyanogenmod/app/LiveLockScreenManager.java similarity index 100% rename from src/java/cyanogenmod/app/LiveLockScreenManager.java rename to sdk/src/java/cyanogenmod/app/LiveLockScreenManager.java diff --git a/src/java/cyanogenmod/app/PartnerInterface.java b/sdk/src/java/cyanogenmod/app/PartnerInterface.java similarity index 100% rename from src/java/cyanogenmod/app/PartnerInterface.java rename to sdk/src/java/cyanogenmod/app/PartnerInterface.java diff --git a/src/java/cyanogenmod/app/Profile.aidl b/sdk/src/java/cyanogenmod/app/Profile.aidl similarity index 100% rename from src/java/cyanogenmod/app/Profile.aidl rename to sdk/src/java/cyanogenmod/app/Profile.aidl diff --git a/src/java/cyanogenmod/app/Profile.java b/sdk/src/java/cyanogenmod/app/Profile.java similarity index 100% rename from src/java/cyanogenmod/app/Profile.java rename to sdk/src/java/cyanogenmod/app/Profile.java diff --git a/src/java/cyanogenmod/app/ProfileGroup.java b/sdk/src/java/cyanogenmod/app/ProfileGroup.java similarity index 100% rename from src/java/cyanogenmod/app/ProfileGroup.java rename to sdk/src/java/cyanogenmod/app/ProfileGroup.java diff --git a/src/java/cyanogenmod/app/ProfileManager.java b/sdk/src/java/cyanogenmod/app/ProfileManager.java similarity index 100% rename from src/java/cyanogenmod/app/ProfileManager.java rename to sdk/src/java/cyanogenmod/app/ProfileManager.java diff --git a/src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl b/sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl similarity index 100% rename from src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl rename to sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.aidl diff --git a/src/java/cyanogenmod/app/StatusBarPanelCustomTile.java b/sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.java similarity index 100% rename from src/java/cyanogenmod/app/StatusBarPanelCustomTile.java rename to sdk/src/java/cyanogenmod/app/StatusBarPanelCustomTile.java diff --git a/src/java/cyanogenmod/app/ThemeComponent.java b/sdk/src/java/cyanogenmod/app/ThemeComponent.java similarity index 100% rename from src/java/cyanogenmod/app/ThemeComponent.java rename to sdk/src/java/cyanogenmod/app/ThemeComponent.java diff --git a/src/java/cyanogenmod/app/ThemeVersion.java b/sdk/src/java/cyanogenmod/app/ThemeVersion.java similarity index 100% rename from src/java/cyanogenmod/app/ThemeVersion.java rename to 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 similarity index 100% rename from src/java/cyanogenmod/app/suggest/AppSuggestManager.java rename to 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 similarity index 100% rename from src/java/cyanogenmod/app/suggest/ApplicationSuggestion.aidl rename to 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 similarity index 100% rename from src/java/cyanogenmod/app/suggest/ApplicationSuggestion.java rename to 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 similarity index 100% rename from src/java/cyanogenmod/app/suggest/IAppSuggestManager.aidl rename to 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 similarity index 100% rename from src/java/cyanogenmod/app/suggest/IAppSuggestProvider.aidl rename to 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 similarity index 100% rename from src/java/cyanogenmod/content/Intent.java rename to sdk/src/java/cyanogenmod/content/Intent.java diff --git a/src/java/cyanogenmod/externalviews/ExternalView.java b/sdk/src/java/cyanogenmod/externalviews/ExternalView.java similarity index 100% rename from src/java/cyanogenmod/externalviews/ExternalView.java rename to sdk/src/java/cyanogenmod/externalviews/ExternalView.java diff --git a/src/java/cyanogenmod/externalviews/ExternalViewProperties.java b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java similarity index 100% rename from src/java/cyanogenmod/externalviews/ExternalViewProperties.java rename to sdk/src/java/cyanogenmod/externalviews/ExternalViewProperties.java diff --git a/src/java/cyanogenmod/externalviews/ExternalViewProviderService.java b/sdk/src/java/cyanogenmod/externalviews/ExternalViewProviderService.java similarity index 100% rename from src/java/cyanogenmod/externalviews/ExternalViewProviderService.java rename to sdk/src/java/cyanogenmod/externalviews/ExternalViewProviderService.java diff --git a/src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl b/sdk/src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl similarity index 100% rename from src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl rename to sdk/src/java/cyanogenmod/externalviews/IExternalViewProvider.aidl diff --git a/src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl b/sdk/src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl similarity index 100% rename from src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl rename to sdk/src/java/cyanogenmod/externalviews/IExternalViewProviderFactory.aidl diff --git a/src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl b/sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl similarity index 100% rename from src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl rename to sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewCallbacks.aidl diff --git a/src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl b/sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl similarity index 100% rename from src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl rename to sdk/src/java/cyanogenmod/externalviews/IKeyguardExternalViewProvider.aidl diff --git a/src/java/cyanogenmod/externalviews/KeyguardExternalView.java b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java similarity index 100% rename from src/java/cyanogenmod/externalviews/KeyguardExternalView.java rename to sdk/src/java/cyanogenmod/externalviews/KeyguardExternalView.java diff --git a/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java b/sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java similarity index 100% rename from src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java rename to sdk/src/java/cyanogenmod/externalviews/KeyguardExternalViewProviderService.java diff --git a/src/java/cyanogenmod/hardware/CMHardwareManager.java b/sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java similarity index 100% rename from src/java/cyanogenmod/hardware/CMHardwareManager.java rename to sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java diff --git a/src/java/cyanogenmod/hardware/DisplayMode.aidl b/sdk/src/java/cyanogenmod/hardware/DisplayMode.aidl similarity index 100% rename from src/java/cyanogenmod/hardware/DisplayMode.aidl rename to sdk/src/java/cyanogenmod/hardware/DisplayMode.aidl diff --git a/src/java/cyanogenmod/hardware/DisplayMode.java b/sdk/src/java/cyanogenmod/hardware/DisplayMode.java similarity index 100% rename from src/java/cyanogenmod/hardware/DisplayMode.java rename to sdk/src/java/cyanogenmod/hardware/DisplayMode.java diff --git a/src/java/cyanogenmod/hardware/ICMHardwareService.aidl b/sdk/src/java/cyanogenmod/hardware/ICMHardwareService.aidl similarity index 100% rename from src/java/cyanogenmod/hardware/ICMHardwareService.aidl rename to sdk/src/java/cyanogenmod/hardware/ICMHardwareService.aidl diff --git a/src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl b/sdk/src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl similarity index 100% rename from src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl rename to sdk/src/java/cyanogenmod/hardware/IThermalListenerCallback.aidl diff --git a/src/java/cyanogenmod/hardware/ThermalListenerCallback.java b/sdk/src/java/cyanogenmod/hardware/ThermalListenerCallback.java similarity index 100% rename from src/java/cyanogenmod/hardware/ThermalListenerCallback.java rename to sdk/src/java/cyanogenmod/hardware/ThermalListenerCallback.java diff --git a/src/java/cyanogenmod/media/MediaRecorder.java b/sdk/src/java/cyanogenmod/media/MediaRecorder.java similarity index 100% rename from src/java/cyanogenmod/media/MediaRecorder.java rename to sdk/src/java/cyanogenmod/media/MediaRecorder.java diff --git a/src/java/cyanogenmod/os/Build.java b/sdk/src/java/cyanogenmod/os/Build.java similarity index 100% rename from src/java/cyanogenmod/os/Build.java rename to sdk/src/java/cyanogenmod/os/Build.java diff --git a/src/java/cyanogenmod/os/Concierge.java b/sdk/src/java/cyanogenmod/os/Concierge.java similarity index 100% rename from src/java/cyanogenmod/os/Concierge.java rename to sdk/src/java/cyanogenmod/os/Concierge.java diff --git a/src/java/cyanogenmod/power/IPerformanceManager.aidl b/sdk/src/java/cyanogenmod/power/IPerformanceManager.aidl similarity index 100% rename from src/java/cyanogenmod/power/IPerformanceManager.aidl rename to sdk/src/java/cyanogenmod/power/IPerformanceManager.aidl diff --git a/src/java/cyanogenmod/power/PerformanceManager.java b/sdk/src/java/cyanogenmod/power/PerformanceManager.java similarity index 100% rename from src/java/cyanogenmod/power/PerformanceManager.java rename to sdk/src/java/cyanogenmod/power/PerformanceManager.java diff --git a/src/java/cyanogenmod/power/PerformanceManagerInternal.java b/sdk/src/java/cyanogenmod/power/PerformanceManagerInternal.java similarity index 100% rename from src/java/cyanogenmod/power/PerformanceManagerInternal.java rename to sdk/src/java/cyanogenmod/power/PerformanceManagerInternal.java diff --git a/src/java/cyanogenmod/profiles/AirplaneModeSettings.java b/sdk/src/java/cyanogenmod/profiles/AirplaneModeSettings.java similarity index 100% rename from src/java/cyanogenmod/profiles/AirplaneModeSettings.java rename to sdk/src/java/cyanogenmod/profiles/AirplaneModeSettings.java diff --git a/src/java/cyanogenmod/profiles/BrightnessSettings.java b/sdk/src/java/cyanogenmod/profiles/BrightnessSettings.java similarity index 100% rename from src/java/cyanogenmod/profiles/BrightnessSettings.java rename to sdk/src/java/cyanogenmod/profiles/BrightnessSettings.java diff --git a/src/java/cyanogenmod/profiles/ConnectionSettings.java b/sdk/src/java/cyanogenmod/profiles/ConnectionSettings.java similarity index 100% rename from src/java/cyanogenmod/profiles/ConnectionSettings.java rename to sdk/src/java/cyanogenmod/profiles/ConnectionSettings.java diff --git a/src/java/cyanogenmod/profiles/LockSettings.java b/sdk/src/java/cyanogenmod/profiles/LockSettings.java similarity index 100% rename from src/java/cyanogenmod/profiles/LockSettings.java rename to sdk/src/java/cyanogenmod/profiles/LockSettings.java diff --git a/src/java/cyanogenmod/profiles/RingModeSettings.java b/sdk/src/java/cyanogenmod/profiles/RingModeSettings.java similarity index 100% rename from src/java/cyanogenmod/profiles/RingModeSettings.java rename to sdk/src/java/cyanogenmod/profiles/RingModeSettings.java diff --git a/src/java/cyanogenmod/profiles/StreamSettings.java b/sdk/src/java/cyanogenmod/profiles/StreamSettings.java similarity index 100% rename from src/java/cyanogenmod/profiles/StreamSettings.java rename to sdk/src/java/cyanogenmod/profiles/StreamSettings.java diff --git a/src/java/cyanogenmod/providers/CMSettings.java b/sdk/src/java/cyanogenmod/providers/CMSettings.java similarity index 100% rename from src/java/cyanogenmod/providers/CMSettings.java rename to sdk/src/java/cyanogenmod/providers/CMSettings.java diff --git a/src/java/cyanogenmod/providers/DataUsageContract.java b/sdk/src/java/cyanogenmod/providers/DataUsageContract.java similarity index 100% rename from src/java/cyanogenmod/providers/DataUsageContract.java rename to sdk/src/java/cyanogenmod/providers/DataUsageContract.java diff --git a/src/java/cyanogenmod/providers/ThemesContract.java b/sdk/src/java/cyanogenmod/providers/ThemesContract.java similarity index 100% rename from src/java/cyanogenmod/providers/ThemesContract.java rename to sdk/src/java/cyanogenmod/providers/ThemesContract.java diff --git a/src/java/cyanogenmod/providers/WeatherContract.java b/sdk/src/java/cyanogenmod/providers/WeatherContract.java similarity index 100% rename from src/java/cyanogenmod/providers/WeatherContract.java rename to sdk/src/java/cyanogenmod/providers/WeatherContract.java diff --git a/src/java/cyanogenmod/themes/IThemeChangeListener.aidl b/sdk/src/java/cyanogenmod/themes/IThemeChangeListener.aidl similarity index 100% rename from src/java/cyanogenmod/themes/IThemeChangeListener.aidl rename to sdk/src/java/cyanogenmod/themes/IThemeChangeListener.aidl diff --git a/src/java/cyanogenmod/themes/IThemeProcessingListener.aidl b/sdk/src/java/cyanogenmod/themes/IThemeProcessingListener.aidl similarity index 100% rename from src/java/cyanogenmod/themes/IThemeProcessingListener.aidl rename to sdk/src/java/cyanogenmod/themes/IThemeProcessingListener.aidl diff --git a/src/java/cyanogenmod/themes/IThemeService.aidl b/sdk/src/java/cyanogenmod/themes/IThemeService.aidl similarity index 100% rename from src/java/cyanogenmod/themes/IThemeService.aidl rename to sdk/src/java/cyanogenmod/themes/IThemeService.aidl diff --git a/src/java/cyanogenmod/themes/ThemeChangeRequest.aidl b/sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.aidl similarity index 100% rename from src/java/cyanogenmod/themes/ThemeChangeRequest.aidl rename to sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.aidl diff --git a/src/java/cyanogenmod/themes/ThemeChangeRequest.java b/sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.java similarity index 100% rename from src/java/cyanogenmod/themes/ThemeChangeRequest.java rename to sdk/src/java/cyanogenmod/themes/ThemeChangeRequest.java diff --git a/src/java/cyanogenmod/themes/ThemeManager.java b/sdk/src/java/cyanogenmod/themes/ThemeManager.java similarity index 100% rename from src/java/cyanogenmod/themes/ThemeManager.java rename to sdk/src/java/cyanogenmod/themes/ThemeManager.java diff --git a/src/java/cyanogenmod/util/ColorUtils.java b/sdk/src/java/cyanogenmod/util/ColorUtils.java similarity index 100% rename from src/java/cyanogenmod/util/ColorUtils.java rename to sdk/src/java/cyanogenmod/util/ColorUtils.java diff --git a/src/java/cyanogenmod/weather/CMWeatherManager.java b/sdk/src/java/cyanogenmod/weather/CMWeatherManager.java similarity index 100% rename from src/java/cyanogenmod/weather/CMWeatherManager.java rename to sdk/src/java/cyanogenmod/weather/CMWeatherManager.java diff --git a/src/java/cyanogenmod/weather/ICMWeatherManager.aidl b/sdk/src/java/cyanogenmod/weather/ICMWeatherManager.aidl similarity index 100% rename from src/java/cyanogenmod/weather/ICMWeatherManager.aidl rename to sdk/src/java/cyanogenmod/weather/ICMWeatherManager.aidl diff --git a/src/java/cyanogenmod/weather/IRequestInfoListener.aidl b/sdk/src/java/cyanogenmod/weather/IRequestInfoListener.aidl similarity index 100% rename from src/java/cyanogenmod/weather/IRequestInfoListener.aidl rename to sdk/src/java/cyanogenmod/weather/IRequestInfoListener.aidl diff --git a/src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl b/sdk/src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl similarity index 100% rename from src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl rename to sdk/src/java/cyanogenmod/weather/IWeatherServiceProviderChangeListener.aidl diff --git a/src/java/cyanogenmod/weather/RequestInfo.aidl b/sdk/src/java/cyanogenmod/weather/RequestInfo.aidl similarity index 100% rename from src/java/cyanogenmod/weather/RequestInfo.aidl rename to sdk/src/java/cyanogenmod/weather/RequestInfo.aidl diff --git a/src/java/cyanogenmod/weather/RequestInfo.java b/sdk/src/java/cyanogenmod/weather/RequestInfo.java similarity index 100% rename from src/java/cyanogenmod/weather/RequestInfo.java rename to sdk/src/java/cyanogenmod/weather/RequestInfo.java diff --git a/src/java/cyanogenmod/weather/WeatherInfo.aidl b/sdk/src/java/cyanogenmod/weather/WeatherInfo.aidl similarity index 100% rename from src/java/cyanogenmod/weather/WeatherInfo.aidl rename to sdk/src/java/cyanogenmod/weather/WeatherInfo.aidl diff --git a/src/java/cyanogenmod/weather/WeatherInfo.java b/sdk/src/java/cyanogenmod/weather/WeatherInfo.java similarity index 100% rename from src/java/cyanogenmod/weather/WeatherInfo.java rename to sdk/src/java/cyanogenmod/weather/WeatherInfo.java diff --git a/src/java/cyanogenmod/weather/WeatherLocation.aidl b/sdk/src/java/cyanogenmod/weather/WeatherLocation.aidl similarity index 100% rename from src/java/cyanogenmod/weather/WeatherLocation.aidl rename to sdk/src/java/cyanogenmod/weather/WeatherLocation.aidl diff --git a/src/java/cyanogenmod/weather/WeatherLocation.java b/sdk/src/java/cyanogenmod/weather/WeatherLocation.java similarity index 100% rename from src/java/cyanogenmod/weather/WeatherLocation.java rename to 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 similarity index 100% rename from src/java/cyanogenmod/weather/util/WeatherUtils.java rename to 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 similarity index 100% rename from src/java/cyanogenmod/weatherservice/IWeatherProviderService.aidl rename to sdk/src/java/cyanogenmod/weatherservice/IWeatherProviderService.aidl diff --git a/src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl b/sdk/src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl similarity index 100% rename from src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl rename to sdk/src/java/cyanogenmod/weatherservice/IWeatherProviderServiceClient.aidl diff --git a/src/java/cyanogenmod/weatherservice/ServiceRequest.java b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequest.java similarity index 100% rename from src/java/cyanogenmod/weatherservice/ServiceRequest.java rename to sdk/src/java/cyanogenmod/weatherservice/ServiceRequest.java diff --git a/src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl similarity index 100% rename from src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl rename to sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.aidl diff --git a/src/java/cyanogenmod/weatherservice/ServiceRequestResult.java b/sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.java similarity index 100% rename from src/java/cyanogenmod/weatherservice/ServiceRequestResult.java rename to sdk/src/java/cyanogenmod/weatherservice/ServiceRequestResult.java diff --git a/src/java/cyanogenmod/weatherservice/WeatherProviderService.java b/sdk/src/java/cyanogenmod/weatherservice/WeatherProviderService.java similarity index 100% rename from src/java/cyanogenmod/weatherservice/WeatherProviderService.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/logging/CMMetricsLogger.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/statusbar/ExternalQuickSettingsRecord.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/statusbar/IStatusBarCustomTileHolder.aidl rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/themes/IIconCacheManager.aidl rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/util/CmLockPatternUtils.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/util/ImageUtils.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/util/QSConstants.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/util/QSUtils.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/util/ScreenType.java rename to 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 similarity index 100% rename from src/java/org/cyanogenmod/internal/util/ThemeUtils.java rename to sdk/src/java/org/cyanogenmod/internal/util/ThemeUtils.java