From 1c55e364d636a8728b8f5f2663b497ae407fe7c6 Mon Sep 17 00:00:00 2001 From: Terrence803 Date: Sat, 14 Dec 2019 19:09:13 +0800 Subject: [PATCH] Gradle --- project/Libraries/DroidPlugin/build.gradle | 23 +--- .../{ => src/main}/AndroidManifest.xml | 2 - .../aidl}/android/app/IServiceConnection.aidl | 0 .../droidplugin/pm/IApplicationCallback.aidl | 0 .../droidplugin/pm/IPackageDataObserver.aidl | 0 .../morgoo/droidplugin/pm/IPluginManager.aidl | 0 .../morgoo/droidplugin/MyCrashHandler.java | 0 .../morgoo/droidplugin/PluginApplication.java | 0 .../com/morgoo/droidplugin/PluginHelper.java | 0 .../droidplugin/PluginManagerService.java | 0 .../droidplugin/PluginPatchManager.java | 0 .../droidplugin/PluginServiceProvider.java | 0 .../am/BaseActivityManagerService.java | 0 .../am/MyActivityManagerService.java | 0 .../droidplugin/am/RunningActivities.java | 0 .../droidplugin/am/RunningProcessList.java | 0 .../morgoo/droidplugin/am/ServiceStubMap.java | 0 .../droidplugin/am/StaticProcessList.java | 0 .../com/morgoo/droidplugin/core/Env.java | 0 .../droidplugin/core/PluginClassLoader.java | 0 .../droidplugin/core/PluginDirHelper.java | 0 .../core/PluginProcessManager.java | 0 .../droidplugin/hook/BaseHookHandle.java | 0 .../com/morgoo/droidplugin/hook/Hook.java | 0 .../morgoo/droidplugin/hook/HookFactory.java | 0 .../droidplugin/hook/HookedMethodHandler.java | 0 .../droidplugin/hook/binder/BinderHook.java | 0 .../hook/binder/IAppOpsServiceBinderHook.java | 0 .../hook/binder/IAudioServiceBinderHook.java | 0 .../hook/binder/IClipboardBinderHook.java | 0 .../binder/IContentServiceBinderHook.java | 0 .../binder/IDisplayManagerBinderHook.java | 0 .../hook/binder/IGraphicsStatsBinderHook.java | 0 .../binder/IInputMethodManagerBinderHook.java | 0 .../binder/ILocationManagerBinderHook.java | 0 .../binder/IMediaRouterServiceBinderHook.java | 0 .../hook/binder/IMmsBinderHook.java | 0 .../hook/binder/IMountServiceBinderHook.java | 0 .../INotificationManagerBinderHook.java | 0 .../hook/binder/IPhoneSubInfoBinderHook.java | 0 .../hook/binder/ISearchManagerBinderHook.java | 0 .../binder/ISessionManagerBinderHook.java | 0 .../hook/binder/ISmsBinderHook.java | 0 .../hook/binder/ISubBinderHook.java | 0 .../hook/binder/ITelephonyBinderHook.java | 0 .../binder/ITelephonyRegistryBinderHook.java | 0 .../hook/binder/IWifiManagerBinderHook.java | 0 .../hook/binder/IWindowManagerBinderHook.java | 0 .../hook/binder/MyServiceManager.java | 0 .../hook/binder/ServiceManagerBinderHook.java | 0 .../binder/ServiceManagerCacheBinderHook.java | 0 .../handle/IActivityManagerHookHandle.java | 0 .../hook/handle/IAppOpsServiceHookHandle.java | 0 .../hook/handle/IAudioServiceHookHandle.java | 0 .../hook/handle/IClipboardHookHandle.java | 0 .../handle/IContentProviderInvokeHandle.java | 0 .../hook/handle/IContentServiceHandle.java | 0 .../handle/IDisplayManagerHookHandle.java | 0 .../hook/handle/IGraphicsStatsHookHandle.java | 0 .../handle/IInputMethodManagerHookHandle.java | 0 .../handle/ILocationManagerHookHandle.java | 0 .../handle/IMediaRouterServiceHookHandle.java | 0 .../hook/handle/IMmsHookHandle.java | 0 .../hook/handle/IMountServiceHookHandle.java | 0 .../INotificationManagerHookHandle.java | 0 .../handle/IPackageManagerHookHandle.java | 0 .../hook/handle/IPhoneSubInfoHookHandle.java | 0 .../hook/handle/ISearchManagerHookHandle.java | 0 .../handle/ISessionManagerHookHandle.java | 0 .../hook/handle/ISmsHookHandle.java | 0 .../hook/handle/ISubBinderHookHandle.java | 0 .../hook/handle/ITelephonyHookHandle.java | 0 .../handle/ITelephonyRegistryHookHandle.java | 0 .../hook/handle/IWifiManagerHookHandle.java | 0 .../hook/handle/IWindowManagerHookHandle.java | 0 .../handle/IWindowSessionInvokeHandle.java | 0 .../hook/handle/LibCoreHookHandle.java | 0 .../hook/handle/PluginCallback.java | 4 +- .../hook/handle/PluginInstrumentation.java | 0 ...laceCallingPackageHookedMethodHandler.java | 0 .../WebViewFactoryProviderHookHandle.java | 0 .../hook/proxy/IActivityManagerHook.java | 0 .../hook/proxy/IContentProviderHook.java | 0 .../hook/proxy/IPackageManagerHook.java | 0 .../hook/proxy/IWindowSessionHook.java | 0 .../hook/proxy/InstrumentationHook.java | 0 .../droidplugin/hook/proxy/LibCoreHook.java | 0 .../hook/proxy/PluginCallbackHook.java | 0 .../droidplugin/hook/proxy/ProxyHook.java | 0 .../proxy/WebViewFactoryProviderHook.java | 0 .../hook/xhook/SQLiteDatabaseHook.java | 0 .../droidplugin/pm/IPluginManagerImpl.java | 0 .../morgoo/droidplugin/pm/PluginManager.java | 0 .../droidplugin/pm/parser/IntentMatcher.java | 0 .../droidplugin/pm/parser/PackageParser.java | 0 .../pm/parser/PackageParserApi15.java | 0 .../pm/parser/PackageParserApi16.java | 0 .../pm/parser/PackageParserApi20.java | 0 .../pm/parser/PackageParserApi21.java | 0 .../pm/parser/PackageParserApi22.java | 0 .../pm/parser/PackageParserApi22Preview1.java | 0 .../pm/parser/PluginPackageParser.java | 0 .../droidplugin/reflect/FieldUtils.java | 0 .../droidplugin/reflect/MemberUtils.java | 0 .../droidplugin/reflect/MethodUtils.java | 0 .../com/morgoo/droidplugin/reflect/Utils.java | 0 .../morgoo/droidplugin/reflect/Validate.java | 0 .../stub/AbstractContentProviderStub.java | 0 .../droidplugin/stub/AbstractServiceStub.java | 0 .../morgoo/droidplugin/stub/ActivityStub.java | 0 .../droidplugin/stub/ContentProviderStub.java | 0 .../droidplugin/stub/MyFakeIBinder.java | 0 .../droidplugin/stub/ServcesManager.java | 0 .../morgoo/droidplugin/stub/ServiceStub.java | 0 .../stub/ShortcutProxyActivity.java | 0 .../com/morgoo/helper/AttributeCache.java | 0 .../helper/ComponentNameComparator.java | 0 .../java}/com/morgoo/helper/Log.java | 0 .../java}/com/morgoo/helper/MyProxy.java | 0 .../java}/com/morgoo/helper/Utils.java | 0 .../helper/compat/ActivityManagerCompat.java | 0 .../compat/ActivityManagerNativeCompat.java | 0 .../helper/compat/ActivityThreadCompat.java | 0 .../com/morgoo/helper/compat/BuildCompat.java | 0 .../morgoo/helper/compat/BundleCompat.java | 0 .../compat/CompatibilityInfoCompat.java | 0 .../helper/compat/ContentProviderCompat.java | 0 .../compat/ContentProviderHolderCompat.java | 0 .../helper/compat/IActivityManagerCompat.java | 0 .../helper/compat/IAppOpsServiceCompat.java | 0 .../helper/compat/IAudioServiceCompat.java | 0 .../helper/compat/IClipboardCompat.java | 0 .../helper/compat/IContentServiceCompat.java | 0 .../helper/compat/IDisplayManagerCompat.java | 0 .../helper/compat/IGraphicsStatsCompat.java | 0 .../compat/IInputMethodManagerCompat.java | 0 .../helper/compat/ILocationManagerCompat.java | 0 .../compat/IMediaRouterServiceCompat.java | 0 .../com/morgoo/helper/compat/IMmsCompat.java | 0 .../helper/compat/IMountServiceCompat.java | 0 .../compat/INotificationManagerCompat.java | 0 .../compat/IPackageDataObserverCompat.java | 0 .../helper/compat/IPhoneSubInfoCompat.java | 0 .../helper/compat/ISearchManagerCompat.java | 0 .../helper/compat/ISessionManagerCompat.java | 0 .../com/morgoo/helper/compat/ISmsCompat.java | 0 .../com/morgoo/helper/compat/ISubCompat.java | 0 .../helper/compat/ITelephonyCompat.java | 0 .../compat/ITelephonyRegistryCompat.java | 0 .../helper/compat/IWifiManagerCompat.java | 0 .../helper/compat/IWindowManagerCompat.java | 0 .../compat/NativeLibraryHelperCompat.java | 0 .../helper/compat/PackageManagerCompat.java | 0 .../compat/ParceledListSliceCompat.java | 0 .../morgoo/helper/compat/ProcessCompat.java | 0 .../helper/compat/QueuedWorkCompat.java | 0 .../helper/compat/ServiceManagerCompat.java | 0 .../morgoo/helper/compat/SingletonCompat.java | 0 .../helper/compat/SystemPropertiesCompat.java | 0 .../helper/compat/UserHandleCompat.java | 0 .../morgoo/helper/compat/VMRuntimeCompat.java | 0 .../helper/compat/WebViewFactoryCompat.java | 0 .../com/morgoo/helper/utils/ProcessUtils.java | 0 .../plugin_activity_loading.xml | 0 .../plugin_activity_loading_bitmap.9.png | Bin .../{ => src/main}/res/values-v11/styles.xml | 0 .../{ => src/main}/res/values-v14/styles.xml | 0 .../{ => src/main}/res/values/strings.xml | 0 .../{ => src/main}/res/values/styles.xml | 0 project/Test/ApiTest/build.gradle | 26 +---- .../{ => src/main}/AndroidManifest.xml | 3 - .../ApiTest/{jni => src/main/cpp}/Core.cpp | 0 .../main/cpp}/HelperJni/HelperJni.cpp | 0 .../main/cpp}/HelperJni/HelperJni.h | 0 .../ApiTest/{jni => src/main/cpp}/help/log.h | 0 .../main/cpp}/help/nativehelper/JNIHelp.cpp | 0 .../main/cpp}/help/nativehelper/JNIHelp.h | 0 .../example/ApiTest/ActivityTestActivity.java | 0 .../com/example/ApiTest/BaseService.java | 0 .../java}/com/example/ApiTest/Binder1.aidl | 0 .../java}/com/example/ApiTest/Binder2.aidl | 0 .../ApiTest/BroadcastReceiverTest.java | 0 .../example/ApiTest/ContentProviderTest.java | 0 .../example/ApiTest/ContentProviderTest2.java | 0 .../ApiTest/LaunchModeTestActivity.java | 0 .../java}/com/example/ApiTest/MyActivity.java | 0 .../example/ApiTest/MyContentProvider1.java | 0 .../example/ApiTest/MyContentProvider2.java | 0 .../example/ApiTest/NativeTestActivity.java | 0 .../com/example/ApiTest/NotificationTest.java | 0 .../java}/com/example/ApiTest/Service1.java | 0 .../java}/com/example/ApiTest/Service2.java | 0 .../java}/com/example/ApiTest/Service3.java | 0 .../java}/com/example/ApiTest/Service4.java | 0 .../com/example/ApiTest/ServiceTest1.java | 0 .../com/example/ApiTest/ServiceTest2.java | 0 .../ApiTest/SingleInstanceActivity.java | 0 .../example/ApiTest/SingleTaskActivity.java | 0 .../example/ApiTest/SingleTopActivity.java | 0 .../com/example/ApiTest/StandardActivity.java | 0 .../ApiTest/StaticBroadcastReceiver.java | 0 .../example/ApiTest/WebViewTestActivity.java | 0 .../com/morgoo/nativec/NativeCHelper.java | 0 .../main}/res/drawable-hdpi/ic_launcher.png | Bin .../main}/res/drawable-ldpi/ic_launcher.png | Bin .../main}/res/drawable-mdpi/ic_launcher.png | Bin .../main}/res/drawable-xhdpi/ic_launcher.png | Bin .../res/layout/activity_activity_test.xml | 0 .../main}/res/layout/activity_launchmode.xml | 0 .../main}/res/layout/activity_native_test.xml | 0 .../res/layout/activity_web_view_test.xml | 0 .../main}/res/layout/broadcast_receiver.xml | 0 .../main}/res/layout/content_provider.xml | 0 .../{ => src/main}/res/layout/main.xml | 0 .../main}/res/layout/notification_test.xml | 0 .../{ => src/main}/res/layout/service.xml | 0 .../{ => src/main}/res/values-v11/styles.xml | 0 .../{ => src/main}/res/values-v14/styles.xml | 0 .../main}/res/values-w820dp/dimens.xml | 0 .../{ => src/main}/res/values/dimens.xml | 0 .../{ => src/main}/res/values/strings.xml | 0 .../{ => src/main}/res/values/styles.xml | 0 project/TestPlugin/build.gradle | 35 +++--- .../{ => src/main}/AndroidManifest.xml | 3 - .../com/example/TestPlugin/ApkFragment.java | 0 .../java}/com/example/TestPlugin/ApkItem.java | 0 .../example/TestPlugin/InstalledFragment.java | 0 .../com/example/TestPlugin/MainActivity.java | 0 .../com/example/TestPlugin/MyActivity.java | 0 .../main}/res/drawable-hdpi/ic_launcher.png | Bin .../main}/res/drawable-ldpi/ic_launcher.png | Bin .../main}/res/drawable-mdpi/ic_launcher.png | Bin .../main}/res/drawable-xhdpi/ic_launcher.png | Bin .../{ => src/main}/res/layout/apk_item.xml | 0 .../{ => src/main}/res/layout/main.xml | 0 .../{ => src/main}/res/values-v11/styles.xml | 0 .../{ => src/main}/res/values-v14/styles.xml | 0 .../{ => src/main}/res/values/strings.xml | 0 .../{ => src/main}/res/values/styles.xml | 0 project/build.gradle | 15 ++- project/gradle.properties | 2 +- project/gradlew | 100 ++++++++++-------- project/gradlew.bat | 14 +-- 243 files changed, 97 insertions(+), 130 deletions(-) rename project/Libraries/DroidPlugin/{ => src/main}/AndroidManifest.xml (99%) rename project/Libraries/DroidPlugin/src/{ => main/aidl}/android/app/IServiceConnection.aidl (100%) rename project/Libraries/DroidPlugin/src/{ => main/aidl}/com/morgoo/droidplugin/pm/IApplicationCallback.aidl (100%) rename project/Libraries/DroidPlugin/src/{ => main/aidl}/com/morgoo/droidplugin/pm/IPackageDataObserver.aidl (100%) rename project/Libraries/DroidPlugin/src/{ => main/aidl}/com/morgoo/droidplugin/pm/IPluginManager.aidl (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/MyCrashHandler.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/PluginApplication.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/PluginHelper.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/PluginManagerService.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/PluginPatchManager.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/PluginServiceProvider.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/am/BaseActivityManagerService.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/am/MyActivityManagerService.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/am/RunningActivities.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/am/RunningProcessList.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/am/ServiceStubMap.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/am/StaticProcessList.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/core/Env.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/core/PluginClassLoader.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/core/PluginDirHelper.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/core/PluginProcessManager.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/BaseHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/Hook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/HookFactory.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/HookedMethodHandler.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/BinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IAppOpsServiceBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IAudioServiceBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IClipboardBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IContentServiceBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IDisplayManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IGraphicsStatsBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IInputMethodManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ILocationManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IMediaRouterServiceBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IMmsBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IMountServiceBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/INotificationManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IPhoneSubInfoBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ISearchManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ISessionManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ISmsBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ISubBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ITelephonyBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ITelephonyRegistryBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IWifiManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/IWindowManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/MyServiceManager.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ServiceManagerBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/binder/ServiceManagerCacheBinderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IActivityManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IAppOpsServiceHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IAudioServiceHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IClipboardHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IContentProviderInvokeHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IContentServiceHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IDisplayManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IGraphicsStatsHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IInputMethodManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ILocationManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IMediaRouterServiceHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IMmsHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IMountServiceHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/INotificationManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IPackageManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IPhoneSubInfoHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ISearchManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ISessionManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ISmsHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ISubBinderHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ITelephonyHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ITelephonyRegistryHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IWifiManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IWindowManagerHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/IWindowSessionInvokeHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/LibCoreHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/PluginCallback.java (99%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/PluginInstrumentation.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/ReplaceCallingPackageHookedMethodHandler.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/handle/WebViewFactoryProviderHookHandle.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/IActivityManagerHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/IContentProviderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/IPackageManagerHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/IWindowSessionHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/InstrumentationHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/LibCoreHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/PluginCallbackHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/ProxyHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/proxy/WebViewFactoryProviderHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/hook/xhook/SQLiteDatabaseHook.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/IPluginManagerImpl.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/PluginManager.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/IntentMatcher.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PackageParser.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PackageParserApi15.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PackageParserApi16.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PackageParserApi20.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PackageParserApi21.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PackageParserApi22.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PackageParserApi22Preview1.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/pm/parser/PluginPackageParser.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/reflect/FieldUtils.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/reflect/MemberUtils.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/reflect/MethodUtils.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/reflect/Utils.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/reflect/Validate.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/AbstractContentProviderStub.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/AbstractServiceStub.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/ActivityStub.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/ContentProviderStub.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/MyFakeIBinder.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/ServcesManager.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/ServiceStub.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/droidplugin/stub/ShortcutProxyActivity.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/AttributeCache.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/ComponentNameComparator.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/Log.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/MyProxy.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/Utils.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ActivityManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ActivityManagerNativeCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ActivityThreadCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/BuildCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/BundleCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/CompatibilityInfoCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ContentProviderCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ContentProviderHolderCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IActivityManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IAppOpsServiceCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IAudioServiceCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IClipboardCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IContentServiceCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IDisplayManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IGraphicsStatsCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IInputMethodManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ILocationManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IMediaRouterServiceCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IMmsCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IMountServiceCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/INotificationManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IPackageDataObserverCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IPhoneSubInfoCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ISearchManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ISessionManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ISmsCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ISubCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ITelephonyCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ITelephonyRegistryCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IWifiManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/IWindowManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/NativeLibraryHelperCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/PackageManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ParceledListSliceCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ProcessCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/QueuedWorkCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/ServiceManagerCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/SingletonCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/SystemPropertiesCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/UserHandleCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/VMRuntimeCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/compat/WebViewFactoryCompat.java (100%) rename project/Libraries/DroidPlugin/src/{ => main/java}/com/morgoo/helper/utils/ProcessUtils.java (100%) rename project/Libraries/DroidPlugin/{ => src/main}/res/drawable-xxhdpi/plugin_activity_loading.xml (100%) rename project/Libraries/DroidPlugin/{ => src/main}/res/drawable-xxhdpi/plugin_activity_loading_bitmap.9.png (100%) rename project/Libraries/DroidPlugin/{ => src/main}/res/values-v11/styles.xml (100%) rename project/Libraries/DroidPlugin/{ => src/main}/res/values-v14/styles.xml (100%) rename project/Libraries/DroidPlugin/{ => src/main}/res/values/strings.xml (100%) rename project/Libraries/DroidPlugin/{ => src/main}/res/values/styles.xml (100%) rename project/Test/ApiTest/{ => src/main}/AndroidManifest.xml (98%) rename project/Test/ApiTest/{jni => src/main/cpp}/Core.cpp (100%) rename project/Test/ApiTest/{jni => src/main/cpp}/HelperJni/HelperJni.cpp (100%) rename project/Test/ApiTest/{jni => src/main/cpp}/HelperJni/HelperJni.h (100%) rename project/Test/ApiTest/{jni => src/main/cpp}/help/log.h (100%) rename project/Test/ApiTest/{jni => src/main/cpp}/help/nativehelper/JNIHelp.cpp (100%) rename project/Test/ApiTest/{jni => src/main/cpp}/help/nativehelper/JNIHelp.h (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/ActivityTestActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/BaseService.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/Binder1.aidl (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/Binder2.aidl (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/BroadcastReceiverTest.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/ContentProviderTest.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/ContentProviderTest2.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/LaunchModeTestActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/MyActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/MyContentProvider1.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/MyContentProvider2.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/NativeTestActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/NotificationTest.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/Service1.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/Service2.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/Service3.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/Service4.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/ServiceTest1.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/ServiceTest2.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/SingleInstanceActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/SingleTaskActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/SingleTopActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/StandardActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/StaticBroadcastReceiver.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/example/ApiTest/WebViewTestActivity.java (100%) rename project/Test/ApiTest/src/{ => main/java}/com/morgoo/nativec/NativeCHelper.java (100%) rename project/Test/ApiTest/{ => src/main}/res/drawable-hdpi/ic_launcher.png (100%) rename project/Test/ApiTest/{ => src/main}/res/drawable-ldpi/ic_launcher.png (100%) rename project/Test/ApiTest/{ => src/main}/res/drawable-mdpi/ic_launcher.png (100%) rename project/Test/ApiTest/{ => src/main}/res/drawable-xhdpi/ic_launcher.png (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/activity_activity_test.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/activity_launchmode.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/activity_native_test.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/activity_web_view_test.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/broadcast_receiver.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/content_provider.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/main.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/notification_test.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/layout/service.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/values-v11/styles.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/values-v14/styles.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/values-w820dp/dimens.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/values/dimens.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/values/strings.xml (100%) rename project/Test/ApiTest/{ => src/main}/res/values/styles.xml (100%) rename project/TestPlugin/{ => src/main}/AndroidManifest.xml (93%) rename project/TestPlugin/src/{ => main/java}/com/example/TestPlugin/ApkFragment.java (100%) rename project/TestPlugin/src/{ => main/java}/com/example/TestPlugin/ApkItem.java (100%) rename project/TestPlugin/src/{ => main/java}/com/example/TestPlugin/InstalledFragment.java (100%) rename project/TestPlugin/src/{ => main/java}/com/example/TestPlugin/MainActivity.java (100%) rename project/TestPlugin/src/{ => main/java}/com/example/TestPlugin/MyActivity.java (100%) rename project/TestPlugin/{ => src/main}/res/drawable-hdpi/ic_launcher.png (100%) rename project/TestPlugin/{ => src/main}/res/drawable-ldpi/ic_launcher.png (100%) rename project/TestPlugin/{ => src/main}/res/drawable-mdpi/ic_launcher.png (100%) rename project/TestPlugin/{ => src/main}/res/drawable-xhdpi/ic_launcher.png (100%) rename project/TestPlugin/{ => src/main}/res/layout/apk_item.xml (100%) rename project/TestPlugin/{ => src/main}/res/layout/main.xml (100%) rename project/TestPlugin/{ => src/main}/res/values-v11/styles.xml (100%) rename project/TestPlugin/{ => src/main}/res/values-v14/styles.xml (100%) rename project/TestPlugin/{ => src/main}/res/values/strings.xml (100%) rename project/TestPlugin/{ => src/main}/res/values/styles.xml (100%) diff --git a/project/Libraries/DroidPlugin/build.gradle b/project/Libraries/DroidPlugin/build.gradle index c782f0d..7252a4e 100644 --- a/project/Libraries/DroidPlugin/build.gradle +++ b/project/Libraries/DroidPlugin/build.gradle @@ -1,29 +1,13 @@ apply plugin: 'com.android.library' dependencies { - provided fileTree(dir: 'lib', include: '*.jar') - compile fileTree(dir: 'libs', include: '*.jar') + compileOnly fileTree(dir: 'lib', include: '*.jar') + implementation fileTree(dir: 'libs', include: '*.jar') } android { compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - jniLibs.srcDirs = ['libs'] - } - - instrumentTest.setRoot('tests') - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } lintOptions { abortOnError false @@ -33,6 +17,9 @@ android { // 建议改为自己的 packageName + .droidplugin_stub ，防止跟其它本插件使用者冲突 def authorityName = "com.morgoo.droidplugin_stub" + minSdkVersion 9 + versionCode 1 + versionName '1.0' buildConfigField "String", "AUTHORITY_NAME", "\"${authorityName}\"" manifestPlaceholders = [ diff --git a/project/Libraries/DroidPlugin/AndroidManifest.xml b/project/Libraries/DroidPlugin/src/main/AndroidManifest.xml similarity index 99% rename from project/Libraries/DroidPlugin/AndroidManifest.xml rename to project/Libraries/DroidPlugin/src/main/AndroidManifest.xml index cc143ec..b20527b 100644 --- a/project/Libraries/DroidPlugin/AndroidManifest.xml +++ b/project/Libraries/DroidPlugin/src/main/AndroidManifest.xml @@ -29,8 +29,6 @@ android:versionCode="1" android:versionName="1.0"> - - diff --git a/project/Libraries/DroidPlugin/src/android/app/IServiceConnection.aidl b/project/Libraries/DroidPlugin/src/main/aidl/android/app/IServiceConnection.aidl similarity index 100% rename from project/Libraries/DroidPlugin/src/android/app/IServiceConnection.aidl rename to project/Libraries/DroidPlugin/src/main/aidl/android/app/IServiceConnection.aidl diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IApplicationCallback.aidl b/project/Libraries/DroidPlugin/src/main/aidl/com/morgoo/droidplugin/pm/IApplicationCallback.aidl similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IApplicationCallback.aidl rename to project/Libraries/DroidPlugin/src/main/aidl/com/morgoo/droidplugin/pm/IApplicationCallback.aidl diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IPackageDataObserver.aidl b/project/Libraries/DroidPlugin/src/main/aidl/com/morgoo/droidplugin/pm/IPackageDataObserver.aidl similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IPackageDataObserver.aidl rename to project/Libraries/DroidPlugin/src/main/aidl/com/morgoo/droidplugin/pm/IPackageDataObserver.aidl diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IPluginManager.aidl b/project/Libraries/DroidPlugin/src/main/aidl/com/morgoo/droidplugin/pm/IPluginManager.aidl similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IPluginManager.aidl rename to project/Libraries/DroidPlugin/src/main/aidl/com/morgoo/droidplugin/pm/IPluginManager.aidl diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/MyCrashHandler.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/MyCrashHandler.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/MyCrashHandler.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/MyCrashHandler.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginApplication.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginApplication.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginApplication.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginApplication.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginHelper.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginHelper.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginHelper.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginHelper.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginManagerService.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginManagerService.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginManagerService.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginManagerService.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginPatchManager.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginPatchManager.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginPatchManager.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginPatchManager.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginServiceProvider.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginServiceProvider.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/PluginServiceProvider.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/PluginServiceProvider.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/BaseActivityManagerService.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/BaseActivityManagerService.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/BaseActivityManagerService.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/BaseActivityManagerService.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/MyActivityManagerService.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/MyActivityManagerService.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/MyActivityManagerService.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/MyActivityManagerService.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/RunningActivities.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/RunningActivities.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/RunningActivities.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/RunningActivities.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/RunningProcessList.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/RunningProcessList.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/RunningProcessList.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/RunningProcessList.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/ServiceStubMap.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/ServiceStubMap.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/ServiceStubMap.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/ServiceStubMap.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/StaticProcessList.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/StaticProcessList.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/StaticProcessList.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/am/StaticProcessList.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/Env.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/Env.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/Env.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/Env.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/PluginClassLoader.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/PluginClassLoader.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/PluginClassLoader.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/PluginClassLoader.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/PluginDirHelper.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/PluginDirHelper.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/PluginDirHelper.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/PluginDirHelper.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/PluginProcessManager.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/PluginProcessManager.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/core/PluginProcessManager.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/core/PluginProcessManager.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/BaseHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/BaseHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/BaseHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/BaseHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/Hook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/Hook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/Hook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/Hook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/HookFactory.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/HookFactory.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/HookFactory.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/HookFactory.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/HookedMethodHandler.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/HookedMethodHandler.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/HookedMethodHandler.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/HookedMethodHandler.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/BinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/BinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/BinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/BinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IAppOpsServiceBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IAppOpsServiceBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IAppOpsServiceBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IAppOpsServiceBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IAudioServiceBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IAudioServiceBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IAudioServiceBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IAudioServiceBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IClipboardBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IClipboardBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IClipboardBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IClipboardBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IContentServiceBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IContentServiceBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IContentServiceBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IContentServiceBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IDisplayManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IDisplayManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IDisplayManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IDisplayManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IGraphicsStatsBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IGraphicsStatsBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IGraphicsStatsBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IGraphicsStatsBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IInputMethodManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IInputMethodManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IInputMethodManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IInputMethodManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ILocationManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ILocationManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ILocationManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ILocationManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IMediaRouterServiceBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IMediaRouterServiceBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IMediaRouterServiceBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IMediaRouterServiceBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IMmsBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IMmsBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IMmsBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IMmsBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IMountServiceBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IMountServiceBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IMountServiceBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IMountServiceBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/INotificationManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/INotificationManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/INotificationManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/INotificationManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IPhoneSubInfoBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IPhoneSubInfoBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IPhoneSubInfoBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IPhoneSubInfoBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISearchManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISearchManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISearchManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISearchManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISessionManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISessionManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISessionManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISessionManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISmsBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISmsBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISmsBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISmsBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISubBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISubBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ISubBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ISubBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ITelephonyBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ITelephonyBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ITelephonyBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ITelephonyBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ITelephonyRegistryBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ITelephonyRegistryBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ITelephonyRegistryBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ITelephonyRegistryBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IWifiManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IWifiManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IWifiManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IWifiManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IWindowManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IWindowManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/IWindowManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/IWindowManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/MyServiceManager.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/MyServiceManager.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/MyServiceManager.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/MyServiceManager.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ServiceManagerBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ServiceManagerBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ServiceManagerBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ServiceManagerBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ServiceManagerCacheBinderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ServiceManagerCacheBinderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/binder/ServiceManagerCacheBinderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/binder/ServiceManagerCacheBinderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IActivityManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IActivityManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IActivityManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IActivityManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IAppOpsServiceHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IAppOpsServiceHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IAppOpsServiceHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IAppOpsServiceHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IAudioServiceHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IAudioServiceHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IAudioServiceHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IAudioServiceHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IClipboardHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IClipboardHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IClipboardHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IClipboardHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IContentProviderInvokeHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IContentProviderInvokeHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IContentProviderInvokeHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IContentProviderInvokeHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IContentServiceHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IContentServiceHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IContentServiceHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IContentServiceHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IDisplayManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IDisplayManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IDisplayManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IDisplayManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IGraphicsStatsHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IGraphicsStatsHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IGraphicsStatsHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IGraphicsStatsHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IInputMethodManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IInputMethodManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IInputMethodManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IInputMethodManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ILocationManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ILocationManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ILocationManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ILocationManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IMediaRouterServiceHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IMediaRouterServiceHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IMediaRouterServiceHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IMediaRouterServiceHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IMmsHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IMmsHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IMmsHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IMmsHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IMountServiceHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IMountServiceHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IMountServiceHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IMountServiceHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/INotificationManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/INotificationManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/INotificationManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/INotificationManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IPackageManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IPackageManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IPackageManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IPackageManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IPhoneSubInfoHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IPhoneSubInfoHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IPhoneSubInfoHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IPhoneSubInfoHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISearchManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISearchManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISearchManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISearchManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISessionManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISessionManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISessionManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISessionManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISmsHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISmsHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISmsHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISmsHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISubBinderHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISubBinderHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ISubBinderHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ISubBinderHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ITelephonyHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ITelephonyHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ITelephonyHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ITelephonyHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ITelephonyRegistryHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ITelephonyRegistryHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ITelephonyRegistryHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ITelephonyRegistryHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IWifiManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IWifiManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IWifiManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IWifiManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IWindowManagerHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IWindowManagerHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IWindowManagerHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IWindowManagerHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IWindowSessionInvokeHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IWindowSessionInvokeHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/IWindowSessionInvokeHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/IWindowSessionInvokeHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/LibCoreHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/LibCoreHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/LibCoreHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/LibCoreHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/PluginCallback.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/PluginCallback.java similarity index 99% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/PluginCallback.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/PluginCallback.java index b59187b..17f5243 100644 --- a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/PluginCallback.java +++ b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/PluginCallback.java @@ -365,7 +365,7 @@ public class PluginCallback implements Handler.Callback { ActivityInfo targetActivityInfo = PluginManager.getInstance().getActivityInfo(targetComponentName, 0); if (targetActivityInfo != null) { - if (targetComponentName != null && targetComponentName.getClassName().startsWith(".")) { + if (targetComponentName != null && targetComponentName.getClassName().startsWith("")) { targetIntent.setClassName(targetComponentName.getPackageName(), targetComponentName.getPackageName() + targetComponentName.getClassName()); } @@ -446,7 +446,7 @@ public class PluginCallback implements Handler.Callback { ResolveInfo info = pm.resolveActivity(targetIntent, 0); if (info != null) { String name = info.activityInfo.name; - if (name != null && name.startsWith(".")) { + if (name != null && name.startsWith("")) { name = info.activityInfo.packageName + info.activityInfo.name; } return ShortcutProxyActivity.class.getName().equals(name); diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/PluginInstrumentation.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/PluginInstrumentation.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/PluginInstrumentation.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/PluginInstrumentation.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ReplaceCallingPackageHookedMethodHandler.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ReplaceCallingPackageHookedMethodHandler.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/ReplaceCallingPackageHookedMethodHandler.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/ReplaceCallingPackageHookedMethodHandler.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/WebViewFactoryProviderHookHandle.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/WebViewFactoryProviderHookHandle.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/WebViewFactoryProviderHookHandle.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/handle/WebViewFactoryProviderHookHandle.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IActivityManagerHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IActivityManagerHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IActivityManagerHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IActivityManagerHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IContentProviderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IContentProviderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IContentProviderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IContentProviderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IPackageManagerHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IPackageManagerHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IPackageManagerHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IPackageManagerHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IWindowSessionHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IWindowSessionHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/IWindowSessionHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/IWindowSessionHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/InstrumentationHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/InstrumentationHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/InstrumentationHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/InstrumentationHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/LibCoreHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/LibCoreHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/LibCoreHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/LibCoreHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/PluginCallbackHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/PluginCallbackHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/PluginCallbackHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/PluginCallbackHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/ProxyHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/ProxyHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/ProxyHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/ProxyHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/WebViewFactoryProviderHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/WebViewFactoryProviderHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/proxy/WebViewFactoryProviderHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/proxy/WebViewFactoryProviderHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/xhook/SQLiteDatabaseHook.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/xhook/SQLiteDatabaseHook.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/xhook/SQLiteDatabaseHook.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/hook/xhook/SQLiteDatabaseHook.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IPluginManagerImpl.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/IPluginManagerImpl.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IPluginManagerImpl.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/IPluginManagerImpl.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/PluginManager.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/PluginManager.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/PluginManager.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/PluginManager.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/IntentMatcher.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/IntentMatcher.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/IntentMatcher.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/IntentMatcher.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParser.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParser.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParser.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParser.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi15.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi15.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi15.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi15.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi16.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi16.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi16.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi16.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi20.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi20.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi20.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi20.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi21.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi21.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi21.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi21.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi22.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi22.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi22.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi22.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi22Preview1.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi22Preview1.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PackageParserApi22Preview1.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PackageParserApi22Preview1.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PluginPackageParser.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PluginPackageParser.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/parser/PluginPackageParser.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/pm/parser/PluginPackageParser.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/FieldUtils.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/FieldUtils.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/FieldUtils.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/FieldUtils.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/MemberUtils.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/MemberUtils.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/MemberUtils.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/MemberUtils.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/MethodUtils.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/MethodUtils.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/MethodUtils.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/MethodUtils.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/Utils.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/Utils.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/Utils.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/Utils.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/Validate.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/Validate.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/reflect/Validate.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/reflect/Validate.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/AbstractContentProviderStub.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/AbstractContentProviderStub.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/AbstractContentProviderStub.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/AbstractContentProviderStub.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/AbstractServiceStub.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/AbstractServiceStub.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/AbstractServiceStub.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/AbstractServiceStub.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ActivityStub.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ActivityStub.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ActivityStub.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ActivityStub.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ContentProviderStub.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ContentProviderStub.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ContentProviderStub.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ContentProviderStub.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/MyFakeIBinder.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/MyFakeIBinder.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/MyFakeIBinder.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/MyFakeIBinder.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ServcesManager.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ServcesManager.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ServcesManager.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ServcesManager.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ServiceStub.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ServiceStub.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ServiceStub.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ServiceStub.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ShortcutProxyActivity.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ShortcutProxyActivity.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/stub/ShortcutProxyActivity.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/droidplugin/stub/ShortcutProxyActivity.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/AttributeCache.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/AttributeCache.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/AttributeCache.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/AttributeCache.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/ComponentNameComparator.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/ComponentNameComparator.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/ComponentNameComparator.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/ComponentNameComparator.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/Log.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/Log.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/Log.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/Log.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/MyProxy.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/MyProxy.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/MyProxy.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/MyProxy.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/Utils.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/Utils.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/Utils.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/Utils.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ActivityManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ActivityManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ActivityManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ActivityManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ActivityManagerNativeCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ActivityManagerNativeCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ActivityManagerNativeCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ActivityManagerNativeCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ActivityThreadCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ActivityThreadCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ActivityThreadCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ActivityThreadCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/BuildCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/BuildCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/BuildCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/BuildCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/BundleCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/BundleCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/BundleCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/BundleCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/CompatibilityInfoCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/CompatibilityInfoCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/CompatibilityInfoCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/CompatibilityInfoCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ContentProviderCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ContentProviderCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ContentProviderCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ContentProviderCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ContentProviderHolderCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ContentProviderHolderCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ContentProviderHolderCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ContentProviderHolderCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IActivityManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IActivityManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IActivityManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IActivityManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IAppOpsServiceCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IAppOpsServiceCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IAppOpsServiceCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IAppOpsServiceCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IAudioServiceCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IAudioServiceCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IAudioServiceCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IAudioServiceCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IClipboardCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IClipboardCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IClipboardCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IClipboardCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IContentServiceCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IContentServiceCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IContentServiceCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IContentServiceCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IDisplayManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IDisplayManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IDisplayManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IDisplayManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IGraphicsStatsCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IGraphicsStatsCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IGraphicsStatsCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IGraphicsStatsCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IInputMethodManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IInputMethodManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IInputMethodManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IInputMethodManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ILocationManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ILocationManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ILocationManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ILocationManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IMediaRouterServiceCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IMediaRouterServiceCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IMediaRouterServiceCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IMediaRouterServiceCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IMmsCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IMmsCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IMmsCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IMmsCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IMountServiceCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IMountServiceCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IMountServiceCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IMountServiceCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/INotificationManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/INotificationManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/INotificationManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/INotificationManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IPackageDataObserverCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IPackageDataObserverCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IPackageDataObserverCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IPackageDataObserverCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IPhoneSubInfoCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IPhoneSubInfoCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IPhoneSubInfoCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IPhoneSubInfoCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISearchManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISearchManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISearchManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISearchManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISessionManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISessionManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISessionManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISessionManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISmsCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISmsCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISmsCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISmsCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISubCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISubCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ISubCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ISubCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ITelephonyCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ITelephonyCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ITelephonyCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ITelephonyCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ITelephonyRegistryCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ITelephonyRegistryCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ITelephonyRegistryCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ITelephonyRegistryCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IWifiManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IWifiManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IWifiManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IWifiManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IWindowManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IWindowManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/IWindowManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/IWindowManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/NativeLibraryHelperCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/NativeLibraryHelperCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/NativeLibraryHelperCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/NativeLibraryHelperCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/PackageManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/PackageManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/PackageManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/PackageManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ParceledListSliceCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ParceledListSliceCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ParceledListSliceCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ParceledListSliceCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ProcessCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ProcessCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ProcessCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ProcessCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/QueuedWorkCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/QueuedWorkCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/QueuedWorkCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/QueuedWorkCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ServiceManagerCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ServiceManagerCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/ServiceManagerCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/ServiceManagerCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/SingletonCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/SingletonCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/SingletonCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/SingletonCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/SystemPropertiesCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/SystemPropertiesCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/SystemPropertiesCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/SystemPropertiesCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/UserHandleCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/UserHandleCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/UserHandleCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/UserHandleCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/VMRuntimeCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/VMRuntimeCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/VMRuntimeCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/VMRuntimeCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/WebViewFactoryCompat.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/WebViewFactoryCompat.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/compat/WebViewFactoryCompat.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/compat/WebViewFactoryCompat.java diff --git a/project/Libraries/DroidPlugin/src/com/morgoo/helper/utils/ProcessUtils.java b/project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/utils/ProcessUtils.java similarity index 100% rename from project/Libraries/DroidPlugin/src/com/morgoo/helper/utils/ProcessUtils.java rename to project/Libraries/DroidPlugin/src/main/java/com/morgoo/helper/utils/ProcessUtils.java diff --git a/project/Libraries/DroidPlugin/res/drawable-xxhdpi/plugin_activity_loading.xml b/project/Libraries/DroidPlugin/src/main/res/drawable-xxhdpi/plugin_activity_loading.xml similarity index 100% rename from project/Libraries/DroidPlugin/res/drawable-xxhdpi/plugin_activity_loading.xml rename to project/Libraries/DroidPlugin/src/main/res/drawable-xxhdpi/plugin_activity_loading.xml diff --git a/project/Libraries/DroidPlugin/res/drawable-xxhdpi/plugin_activity_loading_bitmap.9.png b/project/Libraries/DroidPlugin/src/main/res/drawable-xxhdpi/plugin_activity_loading_bitmap.9.png similarity index 100% rename from project/Libraries/DroidPlugin/res/drawable-xxhdpi/plugin_activity_loading_bitmap.9.png rename to project/Libraries/DroidPlugin/src/main/res/drawable-xxhdpi/plugin_activity_loading_bitmap.9.png diff --git a/project/Libraries/DroidPlugin/res/values-v11/styles.xml b/project/Libraries/DroidPlugin/src/main/res/values-v11/styles.xml similarity index 100% rename from project/Libraries/DroidPlugin/res/values-v11/styles.xml rename to project/Libraries/DroidPlugin/src/main/res/values-v11/styles.xml diff --git a/project/Libraries/DroidPlugin/res/values-v14/styles.xml b/project/Libraries/DroidPlugin/src/main/res/values-v14/styles.xml similarity index 100% rename from project/Libraries/DroidPlugin/res/values-v14/styles.xml rename to project/Libraries/DroidPlugin/src/main/res/values-v14/styles.xml diff --git a/project/Libraries/DroidPlugin/res/values/strings.xml b/project/Libraries/DroidPlugin/src/main/res/values/strings.xml similarity index 100% rename from project/Libraries/DroidPlugin/res/values/strings.xml rename to project/Libraries/DroidPlugin/src/main/res/values/strings.xml diff --git a/project/Libraries/DroidPlugin/res/values/styles.xml b/project/Libraries/DroidPlugin/src/main/res/values/styles.xml similarity index 100% rename from project/Libraries/DroidPlugin/res/values/styles.xml rename to project/Libraries/DroidPlugin/src/main/res/values/styles.xml diff --git a/project/Test/ApiTest/build.gradle b/project/Test/ApiTest/build.gradle index 7bc9e30..107ff80 100644 --- a/project/Test/ApiTest/build.gradle +++ b/project/Test/ApiTest/build.gradle @@ -1,10 +1,10 @@ apply plugin: 'com.android.application' dependencies { - compile fileTree(include: '*.jar', dir: 'libs') - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:design:23.1.1' + implementation fileTree(include: '*.jar', dir: 'libs') + implementation 'com.android.support:support-v4:23.1.1' + implementation 'com.android.support:appcompat-v7:23.1.1' + implementation 'com.android.support:design:23.1.1' } android { @@ -20,24 +20,6 @@ android { cFlags '-DMY_LOG_LEVEL=LOG_VERBOSE' } } - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - jni.srcDirs = ['jni'] - jniLibs.srcDirs = ['libs'] - - } - - instrumentTest.setRoot('tests') - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } lintOptions { abortOnError false diff --git a/project/Test/ApiTest/AndroidManifest.xml b/project/Test/ApiTest/src/main/AndroidManifest.xml similarity index 98% rename from project/Test/ApiTest/AndroidManifest.xml rename to project/Test/ApiTest/src/main/AndroidManifest.xml index 8234c5d..5a5e432 100644 --- a/project/Test/ApiTest/AndroidManifest.xml +++ b/project/Test/ApiTest/src/main/AndroidManifest.xml @@ -4,9 +4,6 @@ android:versionCode="1" android:versionName="1.0"> - - diff --git a/project/gradle.properties b/project/gradle.properties index 0b7ed84..8527aab 100644 --- a/project/gradle.properties +++ b/project/gradle.properties @@ -13,4 +13,4 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Wed Mar 09 17:35:33 CST 2016 -android.useDeprecatedNdk=true +#android.useDeprecatedNdk=true diff --git a/project/gradlew b/project/gradlew index 9d82f78..cccdd3d 100755 --- a/project/gradlew +++ b/project/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,42 +6,6 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -60,6 +24,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" cd "$SAVED" >/dev/null +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/project/gradlew.bat b/project/gradlew.bat index 8a0b282..f955316 100644 --- a/project/gradlew.bat +++ b/project/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line