From 8b53f860eb3171cd43e4bd0e440f2889bd810662 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 19 Sep 2019 10:04:58 +1200 Subject: [PATCH] Move java source, and resources to new paths for gradle Signed-off-by: Mike Beattie --- .../{ => app/src/main}/AndroidManifest.xml.in | 0 .../org/altusmetrum/AltosDroid/AltosBluetooth.java | 0 .../org/altusmetrum/AltosDroid/AltosDebug.java | 0 .../org/altusmetrum/AltosDroid/AltosDroid.java | 0 .../org/altusmetrum/AltosDroid/AltosDroidLink.java | 0 .../AltosDroid/AltosDroidMapInterface.java | 0 .../AltosDroid/AltosDroidMapSourceListener.java | 0 .../AltosDroid/AltosDroidPreferences.java | 0 .../AltosDroid/AltosDroidPreferencesBackend.java | 0 .../org/altusmetrum/AltosDroid/AltosDroidTab.java | 0 .../org/altusmetrum/AltosDroid/AltosMapOffline.java | 0 .../org/altusmetrum/AltosDroid/AltosMapOnline.java | 0 .../java}/org/altusmetrum/AltosDroid/AltosUsb.java | 0 .../org/altusmetrum/AltosDroid/AltosViewPager.java | 0 .../org/altusmetrum/AltosDroid/AltosVoice.java | 0 .../org/altusmetrum/AltosDroid/BuildInfo.java.in | 0 .../org/altusmetrum/AltosDroid/DeviceAddress.java | 0 .../altusmetrum/AltosDroid/DeviceListActivity.java | 0 .../java}/org/altusmetrum/AltosDroid/Dumper.java | 0 .../org/altusmetrum/AltosDroid/GoNoGoLights.java | 0 .../altusmetrum/AltosDroid/IdleModeActivity.java | 0 .../org/altusmetrum/AltosDroid/IgniterActivity.java | 0 .../AltosDroid/ManageFrequenciesActivity.java | 0 .../org/altusmetrum/AltosDroid/MapTypeActivity.java | 0 .../altusmetrum/AltosDroid/PreloadMapActivity.java | 0 .../org/altusmetrum/AltosDroid/SetupActivity.java | 0 .../java}/org/altusmetrum/AltosDroid/TabFlight.java | 0 .../java}/org/altusmetrum/AltosDroid/TabMap.java | 0 .../java}/org/altusmetrum/AltosDroid/TabPad.java | 0 .../org/altusmetrum/AltosDroid/TabRecover.java | 0 .../org/altusmetrum/AltosDroid/TabsAdapter.java | 0 .../org/altusmetrum/AltosDroid/TelemetryLogger.java | 0 .../org/altusmetrum/AltosDroid/TelemetryReader.java | 0 .../altusmetrum/AltosDroid/TelemetryService.java | 0 .../org/altusmetrum/AltosDroid/TelemetryState.java | 0 .../src/main}/res/drawable-hdpi/am_status_c.png | Bin .../src/main}/res/drawable-hdpi/am_status_g.png | Bin .../src/main}/res/drawable-hdpi/app_icon.png | Bin .../ic_maps_indicator_current_position.png | Bin .../src/main}/res/drawable-mdpi/am_status_c.png | Bin .../src/main}/res/drawable-mdpi/am_status_g.png | Bin .../ic_maps_indicator_current_position.png | Bin .../{ => app/src/main}/res/drawable/app_icon.png | Bin altosdroid/{ => app/src/main}/res/drawable/pad.png | Bin .../{ => app/src/main}/res/drawable/rocket.png | Bin .../{ => app/src/main}/res/layout/altosdroid.xml | 0 .../{ => app/src/main}/res/layout/custom_title.xml | 0 .../{ => app/src/main}/res/layout/device_list.xml | 0 .../{ => app/src/main}/res/layout/device_name.xml | 0 .../{ => app/src/main}/res/layout/frequency.xml | 0 .../{ => app/src/main}/res/layout/idle_mode.xml | 0 .../src/main}/res/layout/igniter_status.xml | 0 .../{ => app/src/main}/res/layout/igniters.xml | 0 .../src/main}/res/layout/manage_frequencies.xml | 0 .../{ => app/src/main}/res/layout/map_preload.xml | 0 .../{ => app/src/main}/res/layout/map_type.xml | 0 altosdroid/{ => app/src/main}/res/layout/setup.xml | 0 .../{ => app/src/main}/res/layout/tab_flight.xml | 0 .../{ => app/src/main}/res/layout/tab_layout.xml | 0 .../{ => app/src/main}/res/layout/tab_map.xml | 0 .../{ => app/src/main}/res/layout/tab_pad.xml | 0 .../{ => app/src/main}/res/layout/tab_recover.xml | 0 .../{ => app/src/main}/res/menu/option_menu.xml | 0 altosdroid/{ => app/src/main}/res/values/Colors.xml | 0 .../{ => app/src/main}/res/values/CustomTheme.xml | 0 .../{ => app/src/main}/res/values/strings.xml | 0 .../{ => app/src/main}/res/xml/device_filter.xml | 0 67 files changed, 0 insertions(+), 0 deletions(-) rename altosdroid/{ => app/src/main}/AndroidManifest.xml.in (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosBluetooth.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDebug.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDroid.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDroidLink.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDroidPreferences.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosDroidTab.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosMapOffline.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosMapOnline.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosUsb.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosViewPager.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/AltosVoice.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/BuildInfo.java.in (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/DeviceAddress.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/DeviceListActivity.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/Dumper.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/GoNoGoLights.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/IdleModeActivity.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/IgniterActivity.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/MapTypeActivity.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/PreloadMapActivity.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/SetupActivity.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TabFlight.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TabMap.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TabPad.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TabRecover.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TabsAdapter.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TelemetryLogger.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TelemetryReader.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TelemetryService.java (100%) rename altosdroid/{src => app/src/main/java}/org/altusmetrum/AltosDroid/TelemetryState.java (100%) rename altosdroid/{ => app/src/main}/res/drawable-hdpi/am_status_c.png (100%) rename altosdroid/{ => app/src/main}/res/drawable-hdpi/am_status_g.png (100%) rename altosdroid/{ => app/src/main}/res/drawable-hdpi/app_icon.png (100%) rename altosdroid/{ => app/src/main}/res/drawable-hdpi/ic_maps_indicator_current_position.png (100%) rename altosdroid/{ => app/src/main}/res/drawable-mdpi/am_status_c.png (100%) rename altosdroid/{ => app/src/main}/res/drawable-mdpi/am_status_g.png (100%) rename altosdroid/{ => app/src/main}/res/drawable-mdpi/ic_maps_indicator_current_position.png (100%) rename altosdroid/{ => app/src/main}/res/drawable/app_icon.png (100%) rename altosdroid/{ => app/src/main}/res/drawable/pad.png (100%) rename altosdroid/{ => app/src/main}/res/drawable/rocket.png (100%) rename altosdroid/{ => app/src/main}/res/layout/altosdroid.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/custom_title.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/device_list.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/device_name.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/frequency.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/idle_mode.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/igniter_status.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/igniters.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/manage_frequencies.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/map_preload.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/map_type.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/setup.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/tab_flight.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/tab_layout.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/tab_map.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/tab_pad.xml (100%) rename altosdroid/{ => app/src/main}/res/layout/tab_recover.xml (100%) rename altosdroid/{ => app/src/main}/res/menu/option_menu.xml (100%) rename altosdroid/{ => app/src/main}/res/values/Colors.xml (100%) rename altosdroid/{ => app/src/main}/res/values/CustomTheme.xml (100%) rename altosdroid/{ => app/src/main}/res/values/strings.xml (100%) rename altosdroid/{ => app/src/main}/res/xml/device_filter.xml (100%) diff --git a/altosdroid/AndroidManifest.xml.in b/altosdroid/app/src/main/AndroidManifest.xml.in similarity index 100% rename from altosdroid/AndroidManifest.xml.in rename to altosdroid/app/src/main/AndroidManifest.xml.in diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosBluetooth.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosBluetooth.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDebug.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDebug.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDebug.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDebug.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidLink.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidLink.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidLink.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidLink.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidMapInterface.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidMapSourceListener.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferences.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferences.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferences.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidPreferencesBackend.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosDroidTab.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOffline.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOnline.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOnline.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosMapOnline.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosUsb.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosUsb.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosUsb.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosUsb.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosViewPager.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosViewPager.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosViewPager.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/AltosVoice.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosVoice.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/BuildInfo.java.in similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/BuildInfo.java.in rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/BuildInfo.java.in diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceAddress.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceAddress.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/DeviceAddress.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceAddress.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/DeviceListActivity.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/DeviceListActivity.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/Dumper.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/Dumper.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/Dumper.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/Dumper.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/GoNoGoLights.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/GoNoGoLights.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/GoNoGoLights.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/GoNoGoLights.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/IdleModeActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/IdleModeActivity.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IdleModeActivity.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/IgniterActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/IgniterActivity.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/IgniterActivity.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/ManageFrequenciesActivity.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/MapTypeActivity.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/MapTypeActivity.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/PreloadMapActivity.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/PreloadMapActivity.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/SetupActivity.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabMap.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabMap.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabRecover.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TabRecover.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabRecover.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabsAdapter.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TabsAdapter.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryLogger.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TelemetryLogger.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryLogger.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryReader.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TelemetryReader.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryReader.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryService.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryService.java diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryState.java similarity index 100% rename from altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java rename to altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryState.java diff --git a/altosdroid/res/drawable-hdpi/am_status_c.png b/altosdroid/app/src/main/res/drawable-hdpi/am_status_c.png similarity index 100% rename from altosdroid/res/drawable-hdpi/am_status_c.png rename to altosdroid/app/src/main/res/drawable-hdpi/am_status_c.png diff --git a/altosdroid/res/drawable-hdpi/am_status_g.png b/altosdroid/app/src/main/res/drawable-hdpi/am_status_g.png similarity index 100% rename from altosdroid/res/drawable-hdpi/am_status_g.png rename to altosdroid/app/src/main/res/drawable-hdpi/am_status_g.png diff --git a/altosdroid/res/drawable-hdpi/app_icon.png b/altosdroid/app/src/main/res/drawable-hdpi/app_icon.png similarity index 100% rename from altosdroid/res/drawable-hdpi/app_icon.png rename to altosdroid/app/src/main/res/drawable-hdpi/app_icon.png diff --git a/altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png b/altosdroid/app/src/main/res/drawable-hdpi/ic_maps_indicator_current_position.png similarity index 100% rename from altosdroid/res/drawable-hdpi/ic_maps_indicator_current_position.png rename to altosdroid/app/src/main/res/drawable-hdpi/ic_maps_indicator_current_position.png diff --git a/altosdroid/res/drawable-mdpi/am_status_c.png b/altosdroid/app/src/main/res/drawable-mdpi/am_status_c.png similarity index 100% rename from altosdroid/res/drawable-mdpi/am_status_c.png rename to altosdroid/app/src/main/res/drawable-mdpi/am_status_c.png diff --git a/altosdroid/res/drawable-mdpi/am_status_g.png b/altosdroid/app/src/main/res/drawable-mdpi/am_status_g.png similarity index 100% rename from altosdroid/res/drawable-mdpi/am_status_g.png rename to altosdroid/app/src/main/res/drawable-mdpi/am_status_g.png diff --git a/altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png b/altosdroid/app/src/main/res/drawable-mdpi/ic_maps_indicator_current_position.png similarity index 100% rename from altosdroid/res/drawable-mdpi/ic_maps_indicator_current_position.png rename to altosdroid/app/src/main/res/drawable-mdpi/ic_maps_indicator_current_position.png diff --git a/altosdroid/res/drawable/app_icon.png b/altosdroid/app/src/main/res/drawable/app_icon.png similarity index 100% rename from altosdroid/res/drawable/app_icon.png rename to altosdroid/app/src/main/res/drawable/app_icon.png diff --git a/altosdroid/res/drawable/pad.png b/altosdroid/app/src/main/res/drawable/pad.png similarity index 100% rename from altosdroid/res/drawable/pad.png rename to altosdroid/app/src/main/res/drawable/pad.png diff --git a/altosdroid/res/drawable/rocket.png b/altosdroid/app/src/main/res/drawable/rocket.png similarity index 100% rename from altosdroid/res/drawable/rocket.png rename to altosdroid/app/src/main/res/drawable/rocket.png diff --git a/altosdroid/res/layout/altosdroid.xml b/altosdroid/app/src/main/res/layout/altosdroid.xml similarity index 100% rename from altosdroid/res/layout/altosdroid.xml rename to altosdroid/app/src/main/res/layout/altosdroid.xml diff --git a/altosdroid/res/layout/custom_title.xml b/altosdroid/app/src/main/res/layout/custom_title.xml similarity index 100% rename from altosdroid/res/layout/custom_title.xml rename to altosdroid/app/src/main/res/layout/custom_title.xml diff --git a/altosdroid/res/layout/device_list.xml b/altosdroid/app/src/main/res/layout/device_list.xml similarity index 100% rename from altosdroid/res/layout/device_list.xml rename to altosdroid/app/src/main/res/layout/device_list.xml diff --git a/altosdroid/res/layout/device_name.xml b/altosdroid/app/src/main/res/layout/device_name.xml similarity index 100% rename from altosdroid/res/layout/device_name.xml rename to altosdroid/app/src/main/res/layout/device_name.xml diff --git a/altosdroid/res/layout/frequency.xml b/altosdroid/app/src/main/res/layout/frequency.xml similarity index 100% rename from altosdroid/res/layout/frequency.xml rename to altosdroid/app/src/main/res/layout/frequency.xml diff --git a/altosdroid/res/layout/idle_mode.xml b/altosdroid/app/src/main/res/layout/idle_mode.xml similarity index 100% rename from altosdroid/res/layout/idle_mode.xml rename to altosdroid/app/src/main/res/layout/idle_mode.xml diff --git a/altosdroid/res/layout/igniter_status.xml b/altosdroid/app/src/main/res/layout/igniter_status.xml similarity index 100% rename from altosdroid/res/layout/igniter_status.xml rename to altosdroid/app/src/main/res/layout/igniter_status.xml diff --git a/altosdroid/res/layout/igniters.xml b/altosdroid/app/src/main/res/layout/igniters.xml similarity index 100% rename from altosdroid/res/layout/igniters.xml rename to altosdroid/app/src/main/res/layout/igniters.xml diff --git a/altosdroid/res/layout/manage_frequencies.xml b/altosdroid/app/src/main/res/layout/manage_frequencies.xml similarity index 100% rename from altosdroid/res/layout/manage_frequencies.xml rename to altosdroid/app/src/main/res/layout/manage_frequencies.xml diff --git a/altosdroid/res/layout/map_preload.xml b/altosdroid/app/src/main/res/layout/map_preload.xml similarity index 100% rename from altosdroid/res/layout/map_preload.xml rename to altosdroid/app/src/main/res/layout/map_preload.xml diff --git a/altosdroid/res/layout/map_type.xml b/altosdroid/app/src/main/res/layout/map_type.xml similarity index 100% rename from altosdroid/res/layout/map_type.xml rename to altosdroid/app/src/main/res/layout/map_type.xml diff --git a/altosdroid/res/layout/setup.xml b/altosdroid/app/src/main/res/layout/setup.xml similarity index 100% rename from altosdroid/res/layout/setup.xml rename to altosdroid/app/src/main/res/layout/setup.xml diff --git a/altosdroid/res/layout/tab_flight.xml b/altosdroid/app/src/main/res/layout/tab_flight.xml similarity index 100% rename from altosdroid/res/layout/tab_flight.xml rename to altosdroid/app/src/main/res/layout/tab_flight.xml diff --git a/altosdroid/res/layout/tab_layout.xml b/altosdroid/app/src/main/res/layout/tab_layout.xml similarity index 100% rename from altosdroid/res/layout/tab_layout.xml rename to altosdroid/app/src/main/res/layout/tab_layout.xml diff --git a/altosdroid/res/layout/tab_map.xml b/altosdroid/app/src/main/res/layout/tab_map.xml similarity index 100% rename from altosdroid/res/layout/tab_map.xml rename to altosdroid/app/src/main/res/layout/tab_map.xml diff --git a/altosdroid/res/layout/tab_pad.xml b/altosdroid/app/src/main/res/layout/tab_pad.xml similarity index 100% rename from altosdroid/res/layout/tab_pad.xml rename to altosdroid/app/src/main/res/layout/tab_pad.xml diff --git a/altosdroid/res/layout/tab_recover.xml b/altosdroid/app/src/main/res/layout/tab_recover.xml similarity index 100% rename from altosdroid/res/layout/tab_recover.xml rename to altosdroid/app/src/main/res/layout/tab_recover.xml diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/app/src/main/res/menu/option_menu.xml similarity index 100% rename from altosdroid/res/menu/option_menu.xml rename to altosdroid/app/src/main/res/menu/option_menu.xml diff --git a/altosdroid/res/values/Colors.xml b/altosdroid/app/src/main/res/values/Colors.xml similarity index 100% rename from altosdroid/res/values/Colors.xml rename to altosdroid/app/src/main/res/values/Colors.xml diff --git a/altosdroid/res/values/CustomTheme.xml b/altosdroid/app/src/main/res/values/CustomTheme.xml similarity index 100% rename from altosdroid/res/values/CustomTheme.xml rename to altosdroid/app/src/main/res/values/CustomTheme.xml diff --git a/altosdroid/res/values/strings.xml b/altosdroid/app/src/main/res/values/strings.xml similarity index 100% rename from altosdroid/res/values/strings.xml rename to altosdroid/app/src/main/res/values/strings.xml diff --git a/altosdroid/res/xml/device_filter.xml b/altosdroid/app/src/main/res/xml/device_filter.xml similarity index 100% rename from altosdroid/res/xml/device_filter.xml rename to altosdroid/app/src/main/res/xml/device_filter.xml -- 2.30.2