diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43efa..000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index c7d1c5a83..000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml index 97626ba45..15a15b218 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,4 @@ - - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5fc9b0299..37a750962 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,41 +1,6 @@ - - - - - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7f4..35eb1ddfb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index b870d620e..d7ed29a8e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,17 +1,45 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' - } -} - -allprojects { - repositories { - google() - jcenter() - } -} +apply plugin: 'com.android.application' + +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.4.2' + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +android { + compileSdkVersion 28 + + defaultConfig { + applicationId "com.google.android.maps.mytracks" + minSdkVersion 21 + targetSdkVersion 28 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled true + } + } +} + +dependencies { + implementation 'androidx.appcompat:appcompat:1.0.2' + + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + testImplementation 'androidx.test:core:1.2.0' +} diff --git a/myTracks/lint.xml b/lint.xml similarity index 100% rename from myTracks/lint.xml rename to lint.xml diff --git a/myTracks/build.gradle b/myTracks/build.gradle deleted file mode 100644 index 66233d6ce..000000000 --- a/myTracks/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 28 - - defaultConfig { - applicationId "com.google.android.maps.mytracks" - minSdkVersion 21 - targetSdkVersion 28 - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled true - } - } -} - -dependencies { - implementation 'androidx.appcompat:appcompat:1.0.2' - - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test:rules:1.2.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - testImplementation 'androidx.test:core:1.2.0' -} diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/BootReceiverTest.java b/src/androidTest/java/com/google/android/apps/mytracks/BootReceiverTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/BootReceiverTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/BootReceiverTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/ChartValueSeriesTest.java b/src/androidTest/java/com/google/android/apps/mytracks/ChartValueSeriesTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/ChartValueSeriesTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/ChartValueSeriesTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java b/src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java rename to src/androidTest/java/com/google/android/apps/mytracks/TrackStubUtils.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImplTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImplTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/SearchEngineTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/SearchEngineTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/SearchEngineTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/content/SearchEngineTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/TrackDataHubTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/TrackDataHubTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/TrackDataHubTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/content/TrackDataHubTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/WaypointCreationRequestTest.java b/src/androidTest/java/com/google/android/apps/mytracks/content/WaypointCreationRequestTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/content/WaypointCreationRequestTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/content/WaypointCreationRequestTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java b/src/androidTest/java/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/fragments/ChartFragmentTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java b/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java rename to src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/AbstractTestFileTrackImporter.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java b/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporterTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java b/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporterTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java b/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java rename to src/androidTest/java/com/google/android/apps/mytracks/io/file/importer/LocationsMatcher.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicyTest.java b/src/androidTest/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicyTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicyTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicyTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/ControlRecordingServiceTest.java b/src/androidTest/java/com/google/android/apps/mytracks/services/ControlRecordingServiceTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/ControlRecordingServiceTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/services/ControlRecordingServiceTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java b/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactoryTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskTest.java b/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/stats/TripStatisticsTest.java b/src/androidTest/java/com/google/android/apps/mytracks/stats/TripStatisticsTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/stats/TripStatisticsTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/stats/TripStatisticsTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/util/FileUtilsTest.java b/src/androidTest/java/com/google/android/apps/mytracks/util/FileUtilsTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/util/FileUtilsTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/util/FileUtilsTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java b/src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/util/StringUtilsTest.java diff --git a/myTracks/src/androidTest/java/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java b/src/androidTest/java/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java similarity index 100% rename from myTracks/src/androidTest/java/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java rename to src/androidTest/java/com/google/android/apps/mytracks/util/TrackNameUtilsTest.java diff --git a/myTracks/src/androidTest/res/.readme b/src/androidTest/res/.readme similarity index 100% rename from myTracks/src/androidTest/res/.readme rename to src/androidTest/res/.readme diff --git a/myTracks/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from myTracks/src/main/AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java b/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/AbstractActivity.java rename to src/main/java/com/google/android/apps/mytracks/AbstractActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java b/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java rename to src/main/java/com/google/android/apps/mytracks/AbstractTrackActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java rename to src/main/java/com/google/android/apps/mytracks/AggregatedStatsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/BootReceiver.java b/src/main/java/com/google/android/apps/mytracks/BootReceiver.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/BootReceiver.java rename to src/main/java/com/google/android/apps/mytracks/BootReceiver.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java b/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java rename to src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java b/src/main/java/com/google/android/apps/mytracks/ChartView.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java rename to src/main/java/com/google/android/apps/mytracks/ChartView.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/Constants.java b/src/main/java/com/google/android/apps/mytracks/Constants.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/Constants.java rename to src/main/java/com/google/android/apps/mytracks/Constants.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/ContextualActionModeCallback.java b/src/main/java/com/google/android/apps/mytracks/ContextualActionModeCallback.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/ContextualActionModeCallback.java rename to src/main/java/com/google/android/apps/mytracks/ContextualActionModeCallback.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/DeleteActivity.java b/src/main/java/com/google/android/apps/mytracks/DeleteActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/DeleteActivity.java rename to src/main/java/com/google/android/apps/mytracks/DeleteActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/DeleteAsyncTask.java b/src/main/java/com/google/android/apps/mytracks/DeleteAsyncTask.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/DeleteAsyncTask.java rename to src/main/java/com/google/android/apps/mytracks/DeleteAsyncTask.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java b/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java rename to src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java b/src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java rename to src/main/java/com/google/android/apps/mytracks/MarkerEditActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java b/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java rename to src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java b/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/SearchListActivity.java rename to src/main/java/com/google/android/apps/mytracks/SearchListActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java b/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java rename to src/main/java/com/google/android/apps/mytracks/TabsAdapter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackController.java b/src/main/java/com/google/android/apps/mytracks/TrackController.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/TrackController.java rename to src/main/java/com/google/android/apps/mytracks/TrackController.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java b/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java rename to src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java b/src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java rename to src/main/java/com/google/android/apps/mytracks/TrackEditActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java rename to src/main/java/com/google/android/apps/mytracks/TrackListActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java b/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java rename to src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/DataSource.java b/src/main/java/com/google/android/apps/mytracks/content/DataSource.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/DataSource.java rename to src/main/java/com/google/android/apps/mytracks/content/DataSource.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/DataSourceListener.java b/src/main/java/com/google/android/apps/mytracks/content/DataSourceListener.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/DataSourceListener.java rename to src/main/java/com/google/android/apps/mytracks/content/DataSourceListener.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/DataSourceManager.java b/src/main/java/com/google/android/apps/mytracks/content/DataSourceManager.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/DataSourceManager.java rename to src/main/java/com/google/android/apps/mytracks/content/DataSourceManager.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java b/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java rename to src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java b/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java rename to src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java b/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java rename to src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java b/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java rename to src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java b/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java rename to src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java rename to src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/SearchEngine.java b/src/main/java/com/google/android/apps/mytracks/content/SearchEngine.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/SearchEngine.java rename to src/main/java/com/google/android/apps/mytracks/content/SearchEngine.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/SearchEngineProvider.java b/src/main/java/com/google/android/apps/mytracks/content/SearchEngineProvider.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/SearchEngineProvider.java rename to src/main/java/com/google/android/apps/mytracks/content/SearchEngineProvider.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/Track.java b/src/main/java/com/google/android/apps/mytracks/content/Track.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/Track.java rename to src/main/java/com/google/android/apps/mytracks/content/Track.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java b/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java rename to src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java b/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java rename to src/main/java/com/google/android/apps/mytracks/content/TrackDataListener.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataManager.java b/src/main/java/com/google/android/apps/mytracks/content/TrackDataManager.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataManager.java rename to src/main/java/com/google/android/apps/mytracks/content/TrackDataManager.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataType.java b/src/main/java/com/google/android/apps/mytracks/content/TrackDataType.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataType.java rename to src/main/java/com/google/android/apps/mytracks/content/TrackDataType.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java b/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java rename to src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java b/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java rename to src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl b/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl rename to src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java b/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java rename to src/main/java/com/google/android/apps/mytracks/content/Waypoint.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl b/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl rename to src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java b/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java rename to src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java b/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java rename to src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java b/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java similarity index 85% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java rename to src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java index 61a994aab..ddc3b257e 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java +++ b/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorDataSet.java @@ -12,6 +12,9 @@ public final class SensorDataSet { private float batteryLevel; private long creationTimestamp; + public String sensorName; + public String sensorAddress; + public SensorDataSet(float heartRate, float cadence, float power, float batteryLevel, long creationTimestamp) { this.heartRate = heartRate; this.cadence = cadence; @@ -32,8 +35,10 @@ public final class SensorDataSet { this(heartRate, cadence, DATA_UNAVAILABLE, DATA_UNAVAILABLE, System.currentTimeMillis()); } - public SensorDataSet(float heartRate) { + public SensorDataSet(float heartRate, String sensorName, String sensorAddress) { this(heartRate, DATA_UNAVAILABLE, DATA_UNAVAILABLE, DATA_UNAVAILABLE, System.currentTimeMillis()); + this.sensorName = sensorName; + this.sensorAddress = sensorAddress; } public boolean hasHeartRate() { @@ -79,4 +84,12 @@ public final class SensorDataSet { public float getBatteryLevel() { return batteryLevel; } + + public String getSensorName() { + return sensorName; + } + + public String getSensorAddress() { + return sensorAddress; + } } diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorState.java b/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorState.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/content/sensor/SensorState.java rename to src/main/java/com/google/android/apps/mytracks/content/sensor/SensorState.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeImageAdapter.java b/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeImageAdapter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeImageAdapter.java rename to src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeImageAdapter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ConfirmDeleteDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/ConfirmDeleteDialogFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ConfirmDeleteDialogFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/ConfirmDeleteDialogFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/FileTypeDialogFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java b/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java rename to src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java b/src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java rename to src/main/java/com/google/android/apps/mytracks/io/file/TrackFileFormat.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/FileTrackExporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/GpxTrackWriter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmzTrackExporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/SaveAsyncTask.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackExporterListener.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java b/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/exporter/TrackWriter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/importer/AbstractFileTrackImporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java b/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java rename to src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java b/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java rename to src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportAsyncTask.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/importer/KmzTrackImporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java b/src/main/java/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java rename to src/main/java/com/google/android/apps/mytracks/io/file/importer/TrackImporter.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/AbsoluteLocationListenerPolicy.java b/src/main/java/com/google/android/apps/mytracks/services/AbsoluteLocationListenerPolicy.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/AbsoluteLocationListenerPolicy.java rename to src/main/java/com/google/android/apps/mytracks/services/AbsoluteLocationListenerPolicy.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicy.java b/src/main/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicy.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicy.java rename to src/main/java/com/google/android/apps/mytracks/services/AdaptiveLocationListenerPolicy.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java b/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java rename to src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java b/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java rename to src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/LocationListenerPolicy.java b/src/main/java/com/google/android/apps/mytracks/services/LocationListenerPolicy.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/LocationListenerPolicy.java rename to src/main/java/com/google/android/apps/mytracks/services/LocationListenerPolicy.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java b/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java rename to src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java b/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java rename to src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java b/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java rename to src/main/java/com/google/android/apps/mytracks/services/TrackRecordingServiceConnection.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java b/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java similarity index 90% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java rename to src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java index cbc5b9c5a..f4a1bf31a 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java +++ b/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothConnectionManager.java @@ -30,6 +30,7 @@ import android.util.Log; import androidx.annotation.NonNull; +import com.google.android.apps.mytracks.content.sensor.SensorDataSet; import com.google.android.apps.mytracks.content.sensor.SensorState; import java.util.UUID; @@ -88,14 +89,11 @@ public class BluetoothConnectionManager { @Override public void onCharacteristicChanged(BluetoothGatt gatt, @NonNull BluetoothGattCharacteristic characteristic) { - //DOCUMENTATION https://www.bluetooth.com/specifications/gatt/characteristics/ - byte[] raw = characteristic.getValue(); - int index = ((raw[0] & 0x1) == 1) ? 2 : 1; - int format = (index == 1) ? BluetoothGattCharacteristic.FORMAT_UINT8 : BluetoothGattCharacteristic.FORMAT_UINT16; - int value = characteristic.getIntValue(format, index); + int heartRate = BluetoothLEUtils.parseHeartRate(characteristic); - Log.d(TAG, "Received heart beat rate: " + value); - handler.obtainMessage(MESSAGE_READ, value, value).sendToTarget(); + Log.d(TAG, "Received heart beat rate: " + heartRate); + SensorDataSet sensorDataSet = new SensorDataSet(heartRate, gatt.getDevice().getName(), gatt.getDevice().getAddress()); + handler.obtainMessage(MESSAGE_READ, sensorDataSet).sendToTarget(); } }; diff --git a/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothLEUtils.java b/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothLEUtils.java new file mode 100644 index 000000000..7c2f112c3 --- /dev/null +++ b/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothLEUtils.java @@ -0,0 +1,17 @@ +package com.google.android.apps.mytracks.services.sensors; + +import android.bluetooth.BluetoothGattCharacteristic; + +public final class BluetoothLEUtils { + + private BluetoothLEUtils() {} + + public static int parseHeartRate(BluetoothGattCharacteristic characteristic) { + //DOCUMENTATION https://www.bluetooth.com/specifications/gatt/characteristics/ + byte[] raw = characteristic.getValue(); + int index = ((raw[0] & 0x1) == 1) ? 2 : 1; + int format = (index == 1) ? BluetoothGattCharacteristic.FORMAT_UINT8 : BluetoothGattCharacteristic.FORMAT_UINT16; + int heartRate = characteristic.getIntValue(format, index); + return heartRate; + } +} diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java b/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java similarity index 95% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java rename to src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java index 930dfd8b4..26bc27fb0 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java +++ b/src/main/java/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java @@ -97,7 +97,12 @@ public class BluetoothSensorManager extends SensorManager { Toast.makeText(context, context.getString(R.string.settings_sensor_connected, deviceName), Toast.LENGTH_LONG).show(); break; case BluetoothConnectionManager.MESSAGE_READ: - sensorDataSet = new SensorDataSet(message.arg1, SensorDataSet.DATA_UNAVAILABLE, SensorDataSet.DATA_UNAVAILABLE); + if (!(message.obj instanceof SensorDataSet)) { + Log.e(TAG ,"Received message did not contain a SensorDataSet."); + sensorDataSet = null; + } else { + sensorDataSet = (SensorDataSet) message.obj; + } break; default: break; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManager.java b/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManager.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManager.java rename to src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManager.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java b/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java rename to src/main/java/com/google/android/apps/mytracks/services/sensors/SensorManagerFactory.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTaskFactory.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTask.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTask.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTask.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTask.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskExecutor.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskFactory.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskFactory.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskFactory.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/PeriodicTaskFactory.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTask.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTask.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTask.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTask.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTaskFactory.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTaskFactory.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTaskFactory.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/SplitPeriodicTaskFactory.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java b/src/main/java/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java rename to src/main/java/com/google/android/apps/mytracks/services/tasks/TimerTaskExecutor.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/AbstractSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/AbstractSettingsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/AbstractSettingsActivity.java rename to src/main/java/com/google/android/apps/mytracks/settings/AbstractSettingsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java b/src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java rename to src/main/java/com/google/android/apps/mytracks/settings/ActivityTypePreference.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java rename to src/main/java/com/google/android/apps/mytracks/settings/AdvancedSettingsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java rename to src/main/java/com/google/android/apps/mytracks/settings/ChartSettingsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java b/src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java rename to src/main/java/com/google/android/apps/mytracks/settings/IntegerListPreference.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/MyTracksEditTextPreference.java b/src/main/java/com/google/android/apps/mytracks/settings/MyTracksEditTextPreference.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/MyTracksEditTextPreference.java rename to src/main/java/com/google/android/apps/mytracks/settings/MyTracksEditTextPreference.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/MyTracksListPreference.java b/src/main/java/com/google/android/apps/mytracks/settings/MyTracksListPreference.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/MyTracksListPreference.java rename to src/main/java/com/google/android/apps/mytracks/settings/MyTracksListPreference.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java rename to src/main/java/com/google/android/apps/mytracks/settings/RecordingSettingsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java rename to src/main/java/com/google/android/apps/mytracks/settings/SensorSettingsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/SettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/SettingsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/SettingsActivity.java rename to src/main/java/com/google/android/apps/mytracks/settings/SettingsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java b/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java rename to src/main/java/com/google/android/apps/mytracks/settings/StatsSettingsActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/stats/DoubleBuffer.java b/src/main/java/com/google/android/apps/mytracks/stats/DoubleBuffer.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/stats/DoubleBuffer.java rename to src/main/java/com/google/android/apps/mytracks/stats/DoubleBuffer.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java b/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java rename to src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java b/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java rename to src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java b/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java rename to src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/BluetoothDeviceUtils.java b/src/main/java/com/google/android/apps/mytracks/util/BluetoothDeviceUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/BluetoothDeviceUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/BluetoothDeviceUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/DialogUtils.java b/src/main/java/com/google/android/apps/mytracks/util/DialogUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/DialogUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/DialogUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java b/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/FileUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java b/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/IntentUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java b/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/ListItemUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/LocationUtils.java b/src/main/java/com/google/android/apps/mytracks/util/LocationUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/LocationUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/LocationUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java b/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/PreferencesUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java b/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java similarity index 94% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java index e2faf54fa..f7c4b34dd 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java +++ b/src/main/java/com/google/android/apps/mytracks/util/StatsUtils.java @@ -97,10 +97,12 @@ public class StatsUtils { public static void setSensorData(Context context, Activity activity, SensorDataSet sensorDataSet, boolean isRecording) { { // SensorDataSet: heart rate - View view = getView(activity, null, R.id.stats_sensor_heart_rate_value); - view.setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE); + getView(activity, null, R.id.stats_sensor_container).setVisibility(isRecording ? View.VISIBLE : View.INVISIBLE); + + View viewValue = getView(activity, null, R.id.stats_sensor_heart_rate_value); + View viewSensor = getView(activity, null, R.id.stats_sensor_heart_rate_sensor); if (isRecording) { - setHeartRateValue(context, view, sensorDataSet); + setHeartRateData(context, viewValue, viewSensor, sensorDataSet); } } } @@ -287,15 +289,18 @@ public class StatsUtils { * Sets a heart rate value (sensor) * * @param context the context - * @param view the containing view + * @param viewValue the containing view * @param sensorDataSet the sensorDataSet */ - private static void setHeartRateValue(Context context, View view, SensorDataSet sensorDataSet) { + private static void setHeartRateData(Context context, View viewValue, View viewSensor, SensorDataSet sensorDataSet) { String heartRate = context.getString(R.string.value_unknown); + String sensor = context.getString(R.string.value_unknown); if (sensorDataSet != null && sensorDataSet.hasHeartRate() && sensorDataSet.isRecent(SensorManager.MAX_SENSOR_DATE_SET_AGE)) { heartRate = StringUtils.formatDecimal(sensorDataSet.getHeartRate(), 0); + sensor = sensorDataSet.getSensorName(); } - setItem(context, view, R.string.sensor_state_heart_rate, heartRate, context.getString(R.string.sensor_unit_beats_per_minute)); + setItem(context, viewValue, R.string.sensor_state_heart_rate, heartRate, context.getString(R.string.sensor_unit_beats_per_minute)); + setItem(context, viewSensor, R.string.settings_sensor_bluetooth_sensor, sensor, null); } /** diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/StringUtils.java b/src/main/java/com/google/android/apps/mytracks/util/StringUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/StringUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/StringUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java b/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/SystemUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java b/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java b/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java b/src/main/java/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/TrackRecordingServiceConnectionUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackUtils.java b/src/main/java/com/google/android/apps/mytracks/util/TrackUtils.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackUtils.java rename to src/main/java/com/google/android/apps/mytracks/util/TrackUtils.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/UnitConversions.java b/src/main/java/com/google/android/apps/mytracks/util/UnitConversions.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/util/UnitConversions.java rename to src/main/java/com/google/android/apps/mytracks/util/UnitConversions.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java b/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java rename to src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java similarity index 100% rename from myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java rename to src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java diff --git a/myTracks/src/main/res/anim/fadeout.xml b/src/main/res/anim/fadeout.xml similarity index 100% rename from myTracks/src/main/res/anim/fadeout.xml rename to src/main/res/anim/fadeout.xml diff --git a/myTracks/src/main/res/drawable-hdpi/ab_transparent_dark_holo.9.png b/src/main/res/drawable-hdpi/ab_transparent_dark_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ab_transparent_dark_holo.9.png rename to src/main/res/drawable-hdpi/ab_transparent_dark_holo.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/action_mode_background_mytracks.9.png b/src/main/res/drawable-hdpi/action_mode_background_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/action_mode_background_mytracks.9.png rename to src/main/res/drawable-hdpi/action_mode_background_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_off_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_off_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_off_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_off_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_off_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_off_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_off_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_off_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_on_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_on_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_on_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_on_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_on_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_on_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_on_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png b/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png rename to src/main/res/drawable-hdpi/btn_check_on_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_off_disabled_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_off_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_off_disabled_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_off_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_off_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_off_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_off_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_off_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_off_pressed_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_off_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_off_pressed_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_off_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_on_disabled_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_on_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_on_disabled_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_on_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_on_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_on_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_on_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_on_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/btn_radio_on_pressed_holo_dark.png b/src/main/res/drawable-hdpi/btn_radio_on_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/btn_radio_on_pressed_holo_dark.png rename to src/main/res/drawable-hdpi/btn_radio_on_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_arrow_180.png b/src/main/res/drawable-hdpi/ic_arrow_180.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_arrow_180.png rename to src/main/res/drawable-hdpi/ic_arrow_180.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_arrow_320.png b/src/main/res/drawable-hdpi/ic_arrow_320.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_arrow_320.png rename to src/main/res/drawable-hdpi/ic_arrow_320.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_arrow_long.png b/src/main/res/drawable-hdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_arrow_long.png rename to src/main/res/drawable-hdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_button_pause.png b/src/main/res/drawable-hdpi/ic_button_pause.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_button_pause.png rename to src/main/res/drawable-hdpi/ic_button_pause.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_button_pause_pressed.png b/src/main/res/drawable-hdpi/ic_button_pause_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_button_pause_pressed.png rename to src/main/res/drawable-hdpi/ic_button_pause_pressed.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_button_record.png b/src/main/res/drawable-hdpi/ic_button_record.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_button_record.png rename to src/main/res/drawable-hdpi/ic_button_record.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_button_record_pressed.png b/src/main/res/drawable-hdpi/ic_button_record_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_button_record_pressed.png rename to src/main/res/drawable-hdpi/ic_button_record_pressed.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_button_stop.png b/src/main/res/drawable-hdpi/ic_button_stop.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_button_stop.png rename to src/main/res/drawable-hdpi/ic_button_stop.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_button_stop_disabled.png b/src/main/res/drawable-hdpi/ic_button_stop_disabled.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_button_stop_disabled.png rename to src/main/res/drawable-hdpi/ic_button_stop_disabled.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_button_stop_pressed.png b/src/main/res/drawable-hdpi/ic_button_stop_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_button_stop_pressed.png rename to src/main/res/drawable-hdpi/ic_button_stop_pressed.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_dialog_success.png b/src/main/res/drawable-hdpi/ic_dialog_success.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_dialog_success.png rename to src/main/res/drawable-hdpi/ic_dialog_success.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png rename to src/main/res/drawable-hdpi/ic_launcher_my_tracks.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_marker_blue_pushpin.png b/src/main/res/drawable-hdpi/ic_marker_blue_pushpin.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_marker_blue_pushpin.png rename to src/main/res/drawable-hdpi/ic_marker_blue_pushpin.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png b/src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png rename to src/main/res/drawable-hdpi/ic_marker_yellow_pushpin.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_aggregated_statistics.png b/src/main/res/drawable-hdpi/ic_menu_aggregated_statistics.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_aggregated_statistics.png rename to src/main/res/drawable-hdpi/ic_menu_aggregated_statistics.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_delete.png b/src/main/res/drawable-hdpi/ic_menu_delete.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_delete.png rename to src/main/res/drawable-hdpi/ic_menu_delete.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_edit.png b/src/main/res/drawable-hdpi/ic_menu_edit.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_edit.png rename to src/main/res/drawable-hdpi/ic_menu_edit.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_export.png b/src/main/res/drawable-hdpi/ic_menu_export.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_export.png rename to src/main/res/drawable-hdpi/ic_menu_export.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_import.png b/src/main/res/drawable-hdpi/ic_menu_import.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_import.png rename to src/main/res/drawable-hdpi/ic_menu_import.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_insert_marker.png b/src/main/res/drawable-hdpi/ic_menu_insert_marker.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_insert_marker.png rename to src/main/res/drawable-hdpi/ic_menu_insert_marker.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_insert_photo.png b/src/main/res/drawable-hdpi/ic_menu_insert_photo.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_insert_photo.png rename to src/main/res/drawable-hdpi/ic_menu_insert_photo.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_select_all.png b/src/main/res/drawable-hdpi/ic_menu_select_all.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_select_all.png rename to src/main/res/drawable-hdpi/ic_menu_select_all.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_sensor_state.png b/src/main/res/drawable-hdpi/ic_menu_sensor_state.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_sensor_state.png rename to src/main/res/drawable-hdpi/ic_menu_sensor_state.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_settings.png b/src/main/res/drawable-hdpi/ic_menu_settings.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_settings.png rename to src/main/res/drawable-hdpi/ic_menu_settings.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_show_on_map.png b/src/main/res/drawable-hdpi/ic_menu_show_on_map.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_show_on_map.png rename to src/main/res/drawable-hdpi/ic_menu_show_on_map.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_split_frequency.png b/src/main/res/drawable-hdpi/ic_menu_split_frequency.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_split_frequency.png rename to src/main/res/drawable-hdpi/ic_menu_split_frequency.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_start_gps.png b/src/main/res/drawable-hdpi/ic_menu_start_gps.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_start_gps.png rename to src/main/res/drawable-hdpi/ic_menu_start_gps.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_stop_gps.png b/src/main/res/drawable-hdpi/ic_menu_stop_gps.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_stop_gps.png rename to src/main/res/drawable-hdpi/ic_menu_stop_gps.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_view_photo.png b/src/main/res/drawable-hdpi/ic_menu_view_photo.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_view_photo.png rename to src/main/res/drawable-hdpi/ic_menu_view_photo.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_menu_voice_frequency.png b/src/main/res/drawable-hdpi/ic_menu_voice_frequency.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_menu_voice_frequency.png rename to src/main/res/drawable-hdpi/ic_menu_voice_frequency.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_stat_notify_recording.png b/src/main/res/drawable-hdpi/ic_stat_notify_recording.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_stat_notify_recording.png rename to src/main/res/drawable-hdpi/ic_stat_notify_recording.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_tab_chart.png b/src/main/res/drawable-hdpi/ic_tab_chart.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_tab_chart.png rename to src/main/res/drawable-hdpi/ic_tab_chart.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_tab_stats.png b/src/main/res/drawable-hdpi/ic_tab_stats.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_tab_stats.png rename to src/main/res/drawable-hdpi/ic_tab_stats.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_airplane.png b/src/main/res/drawable-hdpi/ic_track_airplane.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_airplane.png rename to src/main/res/drawable-hdpi/ic_track_airplane.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_bike.png b/src/main/res/drawable-hdpi/ic_track_bike.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_bike.png rename to src/main/res/drawable-hdpi/ic_track_bike.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_boat.png b/src/main/res/drawable-hdpi/ic_track_boat.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_boat.png rename to src/main/res/drawable-hdpi/ic_track_boat.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_drive.png b/src/main/res/drawable-hdpi/ic_track_drive.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_drive.png rename to src/main/res/drawable-hdpi/ic_track_drive.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_generic.png b/src/main/res/drawable-hdpi/ic_track_generic.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_generic.png rename to src/main/res/drawable-hdpi/ic_track_generic.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_paused.png b/src/main/res/drawable-hdpi/ic_track_paused.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_paused.png rename to src/main/res/drawable-hdpi/ic_track_paused.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_recording.png b/src/main/res/drawable-hdpi/ic_track_recording.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_recording.png rename to src/main/res/drawable-hdpi/ic_track_recording.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_run.png b/src/main/res/drawable-hdpi/ic_track_run.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_run.png rename to src/main/res/drawable-hdpi/ic_track_run.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_ski.png b/src/main/res/drawable-hdpi/ic_track_ski.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_ski.png rename to src/main/res/drawable-hdpi/ic_track_ski.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_snow_boarding.png b/src/main/res/drawable-hdpi/ic_track_snow_boarding.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_snow_boarding.png rename to src/main/res/drawable-hdpi/ic_track_snow_boarding.png diff --git a/myTracks/src/main/res/drawable-hdpi/ic_track_walk.png b/src/main/res/drawable-hdpi/ic_track_walk.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/ic_track_walk.png rename to src/main/res/drawable-hdpi/ic_track_walk.png diff --git a/myTracks/src/main/res/drawable-hdpi/list_activated_holo.9.png b/src/main/res/drawable-hdpi/list_activated_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/list_activated_holo.9.png rename to src/main/res/drawable-hdpi/list_activated_holo.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/list_focused_holo.9.png b/src/main/res/drawable-hdpi/list_focused_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/list_focused_holo.9.png rename to src/main/res/drawable-hdpi/list_focused_holo.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/list_longpressed_holo.9.png b/src/main/res/drawable-hdpi/list_longpressed_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/list_longpressed_holo.9.png rename to src/main/res/drawable-hdpi/list_longpressed_holo.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png b/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png rename to src/main/res/drawable-hdpi/list_pressed_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png b/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png rename to src/main/res/drawable-hdpi/list_selector_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/progress_bg_holo_dark.9.png b/src/main/res/drawable-hdpi/progress_bg_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progress_bg_holo_dark.9.png rename to src/main/res/drawable-hdpi/progress_bg_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png b/src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png rename to src/main/res/drawable-hdpi/progress_primary_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png b/src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png rename to src/main/res/drawable-hdpi/progress_secondary_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo1.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo1.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo1.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo1.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo2.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo2.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo2.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo2.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo3.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo3.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo3.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo3.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo4.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo4.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo4.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo4.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo5.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo5.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo5.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo5.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo6.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo6.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo6.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo6.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo7.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo7.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo7.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo7.png diff --git a/myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo8.png b/src/main/res/drawable-hdpi/progressbar_indeterminate_holo8.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/progressbar_indeterminate_holo8.png rename to src/main/res/drawable-hdpi/progressbar_indeterminate_holo8.png diff --git a/myTracks/src/main/res/drawable-hdpi/spinner_default_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_default_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/spinner_default_holo_dark.9.png rename to src/main/res/drawable-hdpi/spinner_default_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/spinner_disabled_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/spinner_disabled_holo_dark.9.png rename to src/main/res/drawable-hdpi/spinner_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/spinner_focused_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/spinner_focused_holo_dark.9.png rename to src/main/res/drawable-hdpi/spinner_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/spinner_pressed_holo_dark.9.png b/src/main/res/drawable-hdpi/spinner_pressed_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/spinner_pressed_holo_dark.9.png rename to src/main/res/drawable-hdpi/spinner_pressed_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/tab_selected_focused_mytracks.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/tab_selected_focused_mytracks.9.png rename to src/main/res/drawable-hdpi/tab_selected_focused_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/tab_selected_mytracks.9.png b/src/main/res/drawable-hdpi/tab_selected_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/tab_selected_mytracks.9.png rename to src/main/res/drawable-hdpi/tab_selected_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png rename to src/main/res/drawable-hdpi/tab_selected_pressed_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png rename to src/main/res/drawable-hdpi/tab_unselected_focused_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/tab_unselected_mytracks.9.png b/src/main/res/drawable-hdpi/tab_unselected_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/tab_unselected_mytracks.9.png rename to src/main/res/drawable-hdpi/tab_unselected_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png rename to src/main/res/drawable-hdpi/tab_unselected_pressed_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/textfield_activated_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_activated_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/textfield_activated_holo_dark.9.png rename to src/main/res/drawable-hdpi/textfield_activated_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/textfield_default_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_default_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/textfield_default_holo_dark.9.png rename to src/main/res/drawable-hdpi/textfield_default_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png rename to src/main/res/drawable-hdpi/textfield_disabled_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/textfield_disabled_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/textfield_disabled_holo_dark.9.png rename to src/main/res/drawable-hdpi/textfield_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-hdpi/textfield_focused_holo_dark.9.png b/src/main/res/drawable-hdpi/textfield_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-hdpi/textfield_focused_holo_dark.9.png rename to src/main/res/drawable-hdpi/textfield_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-land-hdpi/ic_arrow_long.png b/src/main/res/drawable-land-hdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-land-hdpi/ic_arrow_long.png rename to src/main/res/drawable-land-hdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-land-mdpi/ic_arrow_long.png b/src/main/res/drawable-land-mdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-land-mdpi/ic_arrow_long.png rename to src/main/res/drawable-land-mdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-land-xhdpi/ic_arrow_long.png b/src/main/res/drawable-land-xhdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-land-xhdpi/ic_arrow_long.png rename to src/main/res/drawable-land-xhdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-land-xxhdpi/ic_arrow_long.png b/src/main/res/drawable-land-xxhdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-land-xxhdpi/ic_arrow_long.png rename to src/main/res/drawable-land-xxhdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-mdpi/ab_transparent_dark_holo.9.png b/src/main/res/drawable-mdpi/ab_transparent_dark_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ab_transparent_dark_holo.9.png rename to src/main/res/drawable-mdpi/ab_transparent_dark_holo.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/action_mode_background_mytracks.9.png b/src/main/res/drawable-mdpi/action_mode_background_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/action_mode_background_mytracks.9.png rename to src/main/res/drawable-mdpi/action_mode_background_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_off_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_off_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_off_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_off_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_off_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_off_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_off_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_off_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_on_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_on_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_on_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_on_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_on_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_on_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_on_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png b/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png rename to src/main/res/drawable-mdpi/btn_check_on_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_off_disabled_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_off_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_off_disabled_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_off_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_off_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_off_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_off_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_off_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_off_pressed_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_off_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_off_pressed_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_off_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_on_disabled_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_on_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_on_disabled_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_on_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_on_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_on_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_on_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_on_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/btn_radio_on_pressed_holo_dark.png b/src/main/res/drawable-mdpi/btn_radio_on_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/btn_radio_on_pressed_holo_dark.png rename to src/main/res/drawable-mdpi/btn_radio_on_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_arrow_180.png b/src/main/res/drawable-mdpi/ic_arrow_180.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_arrow_180.png rename to src/main/res/drawable-mdpi/ic_arrow_180.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_arrow_320.png b/src/main/res/drawable-mdpi/ic_arrow_320.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_arrow_320.png rename to src/main/res/drawable-mdpi/ic_arrow_320.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_arrow_long.png b/src/main/res/drawable-mdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_arrow_long.png rename to src/main/res/drawable-mdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_button_pause.png b/src/main/res/drawable-mdpi/ic_button_pause.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_button_pause.png rename to src/main/res/drawable-mdpi/ic_button_pause.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_button_pause_pressed.png b/src/main/res/drawable-mdpi/ic_button_pause_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_button_pause_pressed.png rename to src/main/res/drawable-mdpi/ic_button_pause_pressed.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_button_record.png b/src/main/res/drawable-mdpi/ic_button_record.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_button_record.png rename to src/main/res/drawable-mdpi/ic_button_record.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_button_record_pressed.png b/src/main/res/drawable-mdpi/ic_button_record_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_button_record_pressed.png rename to src/main/res/drawable-mdpi/ic_button_record_pressed.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_button_stop.png b/src/main/res/drawable-mdpi/ic_button_stop.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_button_stop.png rename to src/main/res/drawable-mdpi/ic_button_stop.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_button_stop_disabled.png b/src/main/res/drawable-mdpi/ic_button_stop_disabled.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_button_stop_disabled.png rename to src/main/res/drawable-mdpi/ic_button_stop_disabled.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_button_stop_pressed.png b/src/main/res/drawable-mdpi/ic_button_stop_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_button_stop_pressed.png rename to src/main/res/drawable-mdpi/ic_button_stop_pressed.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_dialog_success.png b/src/main/res/drawable-mdpi/ic_dialog_success.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_dialog_success.png rename to src/main/res/drawable-mdpi/ic_dialog_success.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png rename to src/main/res/drawable-mdpi/ic_launcher_my_tracks.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_marker_blue_pushpin.png b/src/main/res/drawable-mdpi/ic_marker_blue_pushpin.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_marker_blue_pushpin.png rename to src/main/res/drawable-mdpi/ic_marker_blue_pushpin.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png b/src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png rename to src/main/res/drawable-mdpi/ic_marker_yellow_pushpin.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_aggregated_statistics.png b/src/main/res/drawable-mdpi/ic_menu_aggregated_statistics.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_aggregated_statistics.png rename to src/main/res/drawable-mdpi/ic_menu_aggregated_statistics.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_delete.png b/src/main/res/drawable-mdpi/ic_menu_delete.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_delete.png rename to src/main/res/drawable-mdpi/ic_menu_delete.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_edit.png b/src/main/res/drawable-mdpi/ic_menu_edit.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_edit.png rename to src/main/res/drawable-mdpi/ic_menu_edit.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_export.png b/src/main/res/drawable-mdpi/ic_menu_export.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_export.png rename to src/main/res/drawable-mdpi/ic_menu_export.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_import.png b/src/main/res/drawable-mdpi/ic_menu_import.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_import.png rename to src/main/res/drawable-mdpi/ic_menu_import.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_insert_marker.png b/src/main/res/drawable-mdpi/ic_menu_insert_marker.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_insert_marker.png rename to src/main/res/drawable-mdpi/ic_menu_insert_marker.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_insert_photo.png b/src/main/res/drawable-mdpi/ic_menu_insert_photo.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_insert_photo.png rename to src/main/res/drawable-mdpi/ic_menu_insert_photo.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_select_all.png b/src/main/res/drawable-mdpi/ic_menu_select_all.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_select_all.png rename to src/main/res/drawable-mdpi/ic_menu_select_all.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_sensor_state.png b/src/main/res/drawable-mdpi/ic_menu_sensor_state.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_sensor_state.png rename to src/main/res/drawable-mdpi/ic_menu_sensor_state.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_settings.png b/src/main/res/drawable-mdpi/ic_menu_settings.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_settings.png rename to src/main/res/drawable-mdpi/ic_menu_settings.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_show_on_map.png b/src/main/res/drawable-mdpi/ic_menu_show_on_map.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_show_on_map.png rename to src/main/res/drawable-mdpi/ic_menu_show_on_map.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_split_frequency.png b/src/main/res/drawable-mdpi/ic_menu_split_frequency.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_split_frequency.png rename to src/main/res/drawable-mdpi/ic_menu_split_frequency.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_start_gps.png b/src/main/res/drawable-mdpi/ic_menu_start_gps.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_start_gps.png rename to src/main/res/drawable-mdpi/ic_menu_start_gps.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_stop_gps.png b/src/main/res/drawable-mdpi/ic_menu_stop_gps.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_stop_gps.png rename to src/main/res/drawable-mdpi/ic_menu_stop_gps.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_view_photo.png b/src/main/res/drawable-mdpi/ic_menu_view_photo.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_view_photo.png rename to src/main/res/drawable-mdpi/ic_menu_view_photo.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_menu_voice_frequency.png b/src/main/res/drawable-mdpi/ic_menu_voice_frequency.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_menu_voice_frequency.png rename to src/main/res/drawable-mdpi/ic_menu_voice_frequency.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_stat_notify_recording.png b/src/main/res/drawable-mdpi/ic_stat_notify_recording.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_stat_notify_recording.png rename to src/main/res/drawable-mdpi/ic_stat_notify_recording.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_tab_chart.png b/src/main/res/drawable-mdpi/ic_tab_chart.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_tab_chart.png rename to src/main/res/drawable-mdpi/ic_tab_chart.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_tab_stats.png b/src/main/res/drawable-mdpi/ic_tab_stats.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_tab_stats.png rename to src/main/res/drawable-mdpi/ic_tab_stats.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_airplane.png b/src/main/res/drawable-mdpi/ic_track_airplane.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_airplane.png rename to src/main/res/drawable-mdpi/ic_track_airplane.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_bike.png b/src/main/res/drawable-mdpi/ic_track_bike.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_bike.png rename to src/main/res/drawable-mdpi/ic_track_bike.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_boat.png b/src/main/res/drawable-mdpi/ic_track_boat.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_boat.png rename to src/main/res/drawable-mdpi/ic_track_boat.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_drive.png b/src/main/res/drawable-mdpi/ic_track_drive.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_drive.png rename to src/main/res/drawable-mdpi/ic_track_drive.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_generic.png b/src/main/res/drawable-mdpi/ic_track_generic.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_generic.png rename to src/main/res/drawable-mdpi/ic_track_generic.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_paused.png b/src/main/res/drawable-mdpi/ic_track_paused.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_paused.png rename to src/main/res/drawable-mdpi/ic_track_paused.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_recording.png b/src/main/res/drawable-mdpi/ic_track_recording.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_recording.png rename to src/main/res/drawable-mdpi/ic_track_recording.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_run.png b/src/main/res/drawable-mdpi/ic_track_run.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_run.png rename to src/main/res/drawable-mdpi/ic_track_run.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_ski.png b/src/main/res/drawable-mdpi/ic_track_ski.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_ski.png rename to src/main/res/drawable-mdpi/ic_track_ski.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_snow_boarding.png b/src/main/res/drawable-mdpi/ic_track_snow_boarding.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_snow_boarding.png rename to src/main/res/drawable-mdpi/ic_track_snow_boarding.png diff --git a/myTracks/src/main/res/drawable-mdpi/ic_track_walk.png b/src/main/res/drawable-mdpi/ic_track_walk.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/ic_track_walk.png rename to src/main/res/drawable-mdpi/ic_track_walk.png diff --git a/myTracks/src/main/res/drawable-mdpi/list_activated_holo.9.png b/src/main/res/drawable-mdpi/list_activated_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/list_activated_holo.9.png rename to src/main/res/drawable-mdpi/list_activated_holo.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/list_focused_holo.9.png b/src/main/res/drawable-mdpi/list_focused_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/list_focused_holo.9.png rename to src/main/res/drawable-mdpi/list_focused_holo.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/list_longpressed_holo.9.png b/src/main/res/drawable-mdpi/list_longpressed_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/list_longpressed_holo.9.png rename to src/main/res/drawable-mdpi/list_longpressed_holo.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/list_pressed_holo_dark.9.png b/src/main/res/drawable-mdpi/list_pressed_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/list_pressed_holo_dark.9.png rename to src/main/res/drawable-mdpi/list_pressed_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png b/src/main/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png rename to src/main/res/drawable-mdpi/list_selector_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/progress_bg_holo_dark.9.png b/src/main/res/drawable-mdpi/progress_bg_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progress_bg_holo_dark.9.png rename to src/main/res/drawable-mdpi/progress_bg_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/progress_primary_holo_dark.9.png b/src/main/res/drawable-mdpi/progress_primary_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progress_primary_holo_dark.9.png rename to src/main/res/drawable-mdpi/progress_primary_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/progress_secondary_holo_dark.9.png b/src/main/res/drawable-mdpi/progress_secondary_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progress_secondary_holo_dark.9.png rename to src/main/res/drawable-mdpi/progress_secondary_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo1.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo1.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo1.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo1.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo2.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo2.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo2.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo2.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo3.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo3.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo3.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo3.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo4.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo4.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo4.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo4.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo5.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo5.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo5.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo5.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo6.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo6.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo6.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo6.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo7.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo7.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo7.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo7.png diff --git a/myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo8.png b/src/main/res/drawable-mdpi/progressbar_indeterminate_holo8.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/progressbar_indeterminate_holo8.png rename to src/main/res/drawable-mdpi/progressbar_indeterminate_holo8.png diff --git a/myTracks/src/main/res/drawable-mdpi/spinner_default_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_default_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/spinner_default_holo_dark.9.png rename to src/main/res/drawable-mdpi/spinner_default_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/spinner_disabled_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/spinner_disabled_holo_dark.9.png rename to src/main/res/drawable-mdpi/spinner_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/spinner_focused_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/spinner_focused_holo_dark.9.png rename to src/main/res/drawable-mdpi/spinner_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/spinner_pressed_holo_dark.9.png b/src/main/res/drawable-mdpi/spinner_pressed_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/spinner_pressed_holo_dark.9.png rename to src/main/res/drawable-mdpi/spinner_pressed_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/tab_selected_focused_mytracks.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/tab_selected_focused_mytracks.9.png rename to src/main/res/drawable-mdpi/tab_selected_focused_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/tab_selected_mytracks.9.png b/src/main/res/drawable-mdpi/tab_selected_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/tab_selected_mytracks.9.png rename to src/main/res/drawable-mdpi/tab_selected_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png rename to src/main/res/drawable-mdpi/tab_selected_pressed_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png rename to src/main/res/drawable-mdpi/tab_unselected_focused_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/tab_unselected_mytracks.9.png b/src/main/res/drawable-mdpi/tab_unselected_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/tab_unselected_mytracks.9.png rename to src/main/res/drawable-mdpi/tab_unselected_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png rename to src/main/res/drawable-mdpi/tab_unselected_pressed_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/textfield_activated_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_activated_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/textfield_activated_holo_dark.9.png rename to src/main/res/drawable-mdpi/textfield_activated_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/textfield_default_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_default_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/textfield_default_holo_dark.9.png rename to src/main/res/drawable-mdpi/textfield_default_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png rename to src/main/res/drawable-mdpi/textfield_disabled_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/textfield_disabled_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/textfield_disabled_holo_dark.9.png rename to src/main/res/drawable-mdpi/textfield_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/textfield_focused_holo_dark.9.png b/src/main/res/drawable-mdpi/textfield_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/textfield_focused_holo_dark.9.png rename to src/main/res/drawable-mdpi/textfield_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-mdpi/track_widget_background.9.png b/src/main/res/drawable-mdpi/track_widget_background.9.png similarity index 100% rename from myTracks/src/main/res/drawable-mdpi/track_widget_background.9.png rename to src/main/res/drawable-mdpi/track_widget_background.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ab_transparent_dark_holo.9.png b/src/main/res/drawable-xhdpi/ab_transparent_dark_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ab_transparent_dark_holo.9.png rename to src/main/res/drawable-xhdpi/ab_transparent_dark_holo.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/action_mode_background_mytracks.9.png b/src/main/res/drawable-xhdpi/action_mode_background_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/action_mode_background_mytracks.9.png rename to src/main/res/drawable-xhdpi/action_mode_background_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_off_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_off_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_off_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_off_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_off_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_on_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_on_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_on_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_on_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png b/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_check_on_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_off_disabled_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_off_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_off_disabled_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_off_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_off_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_off_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_off_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_off_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_off_pressed_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_off_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_off_pressed_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_off_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_on_disabled_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_on_disabled_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_on_disabled_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_on_disabled_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_on_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_on_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_on_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_on_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/btn_radio_on_pressed_holo_dark.png b/src/main/res/drawable-xhdpi/btn_radio_on_pressed_holo_dark.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/btn_radio_on_pressed_holo_dark.png rename to src/main/res/drawable-xhdpi/btn_radio_on_pressed_holo_dark.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_arrow_180.png b/src/main/res/drawable-xhdpi/ic_arrow_180.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_arrow_180.png rename to src/main/res/drawable-xhdpi/ic_arrow_180.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_arrow_320.png b/src/main/res/drawable-xhdpi/ic_arrow_320.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_arrow_320.png rename to src/main/res/drawable-xhdpi/ic_arrow_320.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_arrow_long.png b/src/main/res/drawable-xhdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_arrow_long.png rename to src/main/res/drawable-xhdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_button_pause.png b/src/main/res/drawable-xhdpi/ic_button_pause.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_button_pause.png rename to src/main/res/drawable-xhdpi/ic_button_pause.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_button_pause_pressed.png b/src/main/res/drawable-xhdpi/ic_button_pause_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_button_pause_pressed.png rename to src/main/res/drawable-xhdpi/ic_button_pause_pressed.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_button_record.png b/src/main/res/drawable-xhdpi/ic_button_record.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_button_record.png rename to src/main/res/drawable-xhdpi/ic_button_record.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_button_record_pressed.png b/src/main/res/drawable-xhdpi/ic_button_record_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_button_record_pressed.png rename to src/main/res/drawable-xhdpi/ic_button_record_pressed.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_button_stop.png b/src/main/res/drawable-xhdpi/ic_button_stop.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_button_stop.png rename to src/main/res/drawable-xhdpi/ic_button_stop.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_button_stop_disabled.png b/src/main/res/drawable-xhdpi/ic_button_stop_disabled.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_button_stop_disabled.png rename to src/main/res/drawable-xhdpi/ic_button_stop_disabled.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_button_stop_pressed.png b/src/main/res/drawable-xhdpi/ic_button_stop_pressed.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_button_stop_pressed.png rename to src/main/res/drawable-xhdpi/ic_button_stop_pressed.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_dialog_success.png b/src/main/res/drawable-xhdpi/ic_dialog_success.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_dialog_success.png rename to src/main/res/drawable-xhdpi/ic_dialog_success.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png rename to src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_marker_blue_pushpin.png b/src/main/res/drawable-xhdpi/ic_marker_blue_pushpin.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_marker_blue_pushpin.png rename to src/main/res/drawable-xhdpi/ic_marker_blue_pushpin.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png b/src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png rename to src/main/res/drawable-xhdpi/ic_marker_yellow_pushpin.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_aggregated_statistics.png b/src/main/res/drawable-xhdpi/ic_menu_aggregated_statistics.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_aggregated_statistics.png rename to src/main/res/drawable-xhdpi/ic_menu_aggregated_statistics.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_delete.png b/src/main/res/drawable-xhdpi/ic_menu_delete.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_delete.png rename to src/main/res/drawable-xhdpi/ic_menu_delete.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_edit.png b/src/main/res/drawable-xhdpi/ic_menu_edit.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_edit.png rename to src/main/res/drawable-xhdpi/ic_menu_edit.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_export.png b/src/main/res/drawable-xhdpi/ic_menu_export.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_export.png rename to src/main/res/drawable-xhdpi/ic_menu_export.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_import.png b/src/main/res/drawable-xhdpi/ic_menu_import.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_import.png rename to src/main/res/drawable-xhdpi/ic_menu_import.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_insert_marker.png b/src/main/res/drawable-xhdpi/ic_menu_insert_marker.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_insert_marker.png rename to src/main/res/drawable-xhdpi/ic_menu_insert_marker.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_insert_photo.png b/src/main/res/drawable-xhdpi/ic_menu_insert_photo.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_insert_photo.png rename to src/main/res/drawable-xhdpi/ic_menu_insert_photo.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_select_all.png b/src/main/res/drawable-xhdpi/ic_menu_select_all.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_select_all.png rename to src/main/res/drawable-xhdpi/ic_menu_select_all.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_sensor_state.png b/src/main/res/drawable-xhdpi/ic_menu_sensor_state.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_sensor_state.png rename to src/main/res/drawable-xhdpi/ic_menu_sensor_state.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_settings.png b/src/main/res/drawable-xhdpi/ic_menu_settings.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_settings.png rename to src/main/res/drawable-xhdpi/ic_menu_settings.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_show_on_map.png b/src/main/res/drawable-xhdpi/ic_menu_show_on_map.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_show_on_map.png rename to src/main/res/drawable-xhdpi/ic_menu_show_on_map.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_split_frequency.png b/src/main/res/drawable-xhdpi/ic_menu_split_frequency.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_split_frequency.png rename to src/main/res/drawable-xhdpi/ic_menu_split_frequency.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_start_gps.png b/src/main/res/drawable-xhdpi/ic_menu_start_gps.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_start_gps.png rename to src/main/res/drawable-xhdpi/ic_menu_start_gps.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_stop_gps.png b/src/main/res/drawable-xhdpi/ic_menu_stop_gps.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_stop_gps.png rename to src/main/res/drawable-xhdpi/ic_menu_stop_gps.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_view_photo.png b/src/main/res/drawable-xhdpi/ic_menu_view_photo.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_view_photo.png rename to src/main/res/drawable-xhdpi/ic_menu_view_photo.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_menu_voice_frequency.png b/src/main/res/drawable-xhdpi/ic_menu_voice_frequency.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_menu_voice_frequency.png rename to src/main/res/drawable-xhdpi/ic_menu_voice_frequency.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_stat_notify_recording.png b/src/main/res/drawable-xhdpi/ic_stat_notify_recording.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_stat_notify_recording.png rename to src/main/res/drawable-xhdpi/ic_stat_notify_recording.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_airplane.png b/src/main/res/drawable-xhdpi/ic_track_airplane.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_airplane.png rename to src/main/res/drawable-xhdpi/ic_track_airplane.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_bike.png b/src/main/res/drawable-xhdpi/ic_track_bike.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_bike.png rename to src/main/res/drawable-xhdpi/ic_track_bike.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_boat.png b/src/main/res/drawable-xhdpi/ic_track_boat.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_boat.png rename to src/main/res/drawable-xhdpi/ic_track_boat.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_drive.png b/src/main/res/drawable-xhdpi/ic_track_drive.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_drive.png rename to src/main/res/drawable-xhdpi/ic_track_drive.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_generic.png b/src/main/res/drawable-xhdpi/ic_track_generic.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_generic.png rename to src/main/res/drawable-xhdpi/ic_track_generic.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_paused.png b/src/main/res/drawable-xhdpi/ic_track_paused.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_paused.png rename to src/main/res/drawable-xhdpi/ic_track_paused.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_recording.png b/src/main/res/drawable-xhdpi/ic_track_recording.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_recording.png rename to src/main/res/drawable-xhdpi/ic_track_recording.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_run.png b/src/main/res/drawable-xhdpi/ic_track_run.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_run.png rename to src/main/res/drawable-xhdpi/ic_track_run.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_ski.png b/src/main/res/drawable-xhdpi/ic_track_ski.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_ski.png rename to src/main/res/drawable-xhdpi/ic_track_ski.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_snow_boarding.png b/src/main/res/drawable-xhdpi/ic_track_snow_boarding.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_snow_boarding.png rename to src/main/res/drawable-xhdpi/ic_track_snow_boarding.png diff --git a/myTracks/src/main/res/drawable-xhdpi/ic_track_walk.png b/src/main/res/drawable-xhdpi/ic_track_walk.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/ic_track_walk.png rename to src/main/res/drawable-xhdpi/ic_track_walk.png diff --git a/myTracks/src/main/res/drawable-xhdpi/list_activated_holo.9.png b/src/main/res/drawable-xhdpi/list_activated_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/list_activated_holo.9.png rename to src/main/res/drawable-xhdpi/list_activated_holo.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/list_focused_holo.9.png b/src/main/res/drawable-xhdpi/list_focused_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/list_focused_holo.9.png rename to src/main/res/drawable-xhdpi/list_focused_holo.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png b/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/list_longpressed_holo.9.png rename to src/main/res/drawable-xhdpi/list_longpressed_holo.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/list_pressed_holo_dark.9.png b/src/main/res/drawable-xhdpi/list_pressed_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/list_pressed_holo_dark.9.png rename to src/main/res/drawable-xhdpi/list_pressed_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png b/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png rename to src/main/res/drawable-xhdpi/list_selector_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progress_bg_holo_dark.9.png b/src/main/res/drawable-xhdpi/progress_bg_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progress_bg_holo_dark.9.png rename to src/main/res/drawable-xhdpi/progress_bg_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progress_primary_holo_dark.9.png b/src/main/res/drawable-xhdpi/progress_primary_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progress_primary_holo_dark.9.png rename to src/main/res/drawable-xhdpi/progress_primary_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progress_secondary_holo_dark.9.png b/src/main/res/drawable-xhdpi/progress_secondary_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progress_secondary_holo_dark.9.png rename to src/main/res/drawable-xhdpi/progress_secondary_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo1.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo1.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo1.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo1.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo2.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo2.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo2.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo2.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo3.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo3.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo3.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo3.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo4.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo4.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo4.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo4.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo5.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo5.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo5.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo5.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo6.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo6.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo6.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo6.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo7.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo7.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo7.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo7.png diff --git a/myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo8.png b/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo8.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/progressbar_indeterminate_holo8.png rename to src/main/res/drawable-xhdpi/progressbar_indeterminate_holo8.png diff --git a/myTracks/src/main/res/drawable-xhdpi/spinner_default_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_default_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/spinner_default_holo_dark.9.png rename to src/main/res/drawable-xhdpi/spinner_default_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png rename to src/main/res/drawable-xhdpi/spinner_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/spinner_focused_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/spinner_focused_holo_dark.9.png rename to src/main/res/drawable-xhdpi/spinner_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png b/src/main/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png rename to src/main/res/drawable-xhdpi/spinner_pressed_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png rename to src/main/res/drawable-xhdpi/tab_selected_focused_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/tab_selected_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_selected_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/tab_selected_mytracks.9.png rename to src/main/res/drawable-xhdpi/tab_selected_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png rename to src/main/res/drawable-xhdpi/tab_selected_pressed_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_focused_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/tab_unselected_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_unselected_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/tab_unselected_mytracks.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_pressed_mytracks.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/textfield_activated_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_activated_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/textfield_activated_holo_dark.9.png rename to src/main/res/drawable-xhdpi/textfield_activated_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/textfield_default_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_default_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/textfield_default_holo_dark.9.png rename to src/main/res/drawable-xhdpi/textfield_default_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png rename to src/main/res/drawable-xhdpi/textfield_disabled_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png rename to src/main/res/drawable-xhdpi/textfield_disabled_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xhdpi/textfield_focused_holo_dark.9.png b/src/main/res/drawable-xhdpi/textfield_focused_holo_dark.9.png similarity index 100% rename from myTracks/src/main/res/drawable-xhdpi/textfield_focused_holo_dark.9.png rename to src/main/res/drawable-xhdpi/textfield_focused_holo_dark.9.png diff --git a/myTracks/src/main/res/drawable-xxhdpi/ic_arrow_long.png b/src/main/res/drawable-xxhdpi/ic_arrow_long.png similarity index 100% rename from myTracks/src/main/res/drawable-xxhdpi/ic_arrow_long.png rename to src/main/res/drawable-xxhdpi/ic_arrow_long.png diff --git a/myTracks/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png b/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png similarity index 100% rename from myTracks/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png rename to src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png diff --git a/myTracks/src/main/res/drawable/activated_background_holo_dark.xml b/src/main/res/drawable/activated_background_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/activated_background_holo_dark.xml rename to src/main/res/drawable/activated_background_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/btn_check_holo_dark.xml b/src/main/res/drawable/btn_check_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/btn_check_holo_dark.xml rename to src/main/res/drawable/btn_check_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/btn_radio_holo_dark.xml b/src/main/res/drawable/btn_radio_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/btn_radio_holo_dark.xml rename to src/main/res/drawable/btn_radio_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/button_pause.xml b/src/main/res/drawable/button_pause.xml similarity index 100% rename from myTracks/src/main/res/drawable/button_pause.xml rename to src/main/res/drawable/button_pause.xml diff --git a/myTracks/src/main/res/drawable/button_record.xml b/src/main/res/drawable/button_record.xml similarity index 100% rename from myTracks/src/main/res/drawable/button_record.xml rename to src/main/res/drawable/button_record.xml diff --git a/myTracks/src/main/res/drawable/button_stop.xml b/src/main/res/drawable/button_stop.xml similarity index 100% rename from myTracks/src/main/res/drawable/button_stop.xml rename to src/main/res/drawable/button_stop.xml diff --git a/myTracks/src/main/res/drawable/edit_text_holo_dark.xml b/src/main/res/drawable/edit_text_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/edit_text_holo_dark.xml rename to src/main/res/drawable/edit_text_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/list_selector_background_transition_holo_dark.xml b/src/main/res/drawable/list_selector_background_transition_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/list_selector_background_transition_holo_dark.xml rename to src/main/res/drawable/list_selector_background_transition_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/list_selector_holo_dark.xml b/src/main/res/drawable/list_selector_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/list_selector_holo_dark.xml rename to src/main/res/drawable/list_selector_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/progress_horizontal_holo_dark.xml b/src/main/res/drawable/progress_horizontal_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/progress_horizontal_holo_dark.xml rename to src/main/res/drawable/progress_horizontal_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml b/src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml rename to src/main/res/drawable/progress_indeterminate_horizontal_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/spinner_background_holo_dark.xml b/src/main/res/drawable/spinner_background_holo_dark.xml similarity index 100% rename from myTracks/src/main/res/drawable/spinner_background_holo_dark.xml rename to src/main/res/drawable/spinner_background_holo_dark.xml diff --git a/myTracks/src/main/res/drawable/tab_indicator_mytracks.xml b/src/main/res/drawable/tab_indicator_mytracks.xml similarity index 100% rename from myTracks/src/main/res/drawable/tab_indicator_mytracks.xml rename to src/main/res/drawable/tab_indicator_mytracks.xml diff --git a/myTracks/src/main/res/drawable/text_gradient.xml b/src/main/res/drawable/text_gradient.xml similarity index 100% rename from myTracks/src/main/res/drawable/text_gradient.xml rename to src/main/res/drawable/text_gradient.xml diff --git a/myTracks/src/main/res/layout-land/stats_content.xml b/src/main/res/layout-land/stats_content.xml similarity index 100% rename from myTracks/src/main/res/layout-land/stats_content.xml rename to src/main/res/layout-land/stats_content.xml diff --git a/myTracks/src/main/res/layout-land/track_controller.xml b/src/main/res/layout-land/track_controller.xml similarity index 100% rename from myTracks/src/main/res/layout-land/track_controller.xml rename to src/main/res/layout-land/track_controller.xml diff --git a/myTracks/src/main/res/layout-land/track_detail.xml b/src/main/res/layout-land/track_detail.xml similarity index 100% rename from myTracks/src/main/res/layout-land/track_detail.xml rename to src/main/res/layout-land/track_detail.xml diff --git a/myTracks/src/main/res/layout-land/track_list.xml b/src/main/res/layout-land/track_list.xml similarity index 100% rename from myTracks/src/main/res/layout-land/track_list.xml rename to src/main/res/layout-land/track_list.xml diff --git a/myTracks/src/main/res/layout/activity_type_preference.xml b/src/main/res/layout/activity_type_preference.xml similarity index 100% rename from myTracks/src/main/res/layout/activity_type_preference.xml rename to src/main/res/layout/activity_type_preference.xml diff --git a/myTracks/src/main/res/layout/chart.xml b/src/main/res/layout/chart.xml similarity index 100% rename from myTracks/src/main/res/layout/chart.xml rename to src/main/res/layout/chart.xml diff --git a/myTracks/src/main/res/layout/choose_activity_list_item.xml b/src/main/res/layout/choose_activity_list_item.xml similarity index 100% rename from myTracks/src/main/res/layout/choose_activity_list_item.xml rename to src/main/res/layout/choose_activity_list_item.xml diff --git a/myTracks/src/main/res/layout/choose_activity_type.xml b/src/main/res/layout/choose_activity_type.xml similarity index 100% rename from myTracks/src/main/res/layout/choose_activity_type.xml rename to src/main/res/layout/choose_activity_type.xml diff --git a/myTracks/src/main/res/layout/list_item.xml b/src/main/res/layout/list_item.xml similarity index 100% rename from myTracks/src/main/res/layout/list_item.xml rename to src/main/res/layout/list_item.xml diff --git a/myTracks/src/main/res/layout/marker_detail_activity.xml b/src/main/res/layout/marker_detail_activity.xml similarity index 100% rename from myTracks/src/main/res/layout/marker_detail_activity.xml rename to src/main/res/layout/marker_detail_activity.xml diff --git a/myTracks/src/main/res/layout/marker_detail_fragment.xml b/src/main/res/layout/marker_detail_fragment.xml similarity index 100% rename from myTracks/src/main/res/layout/marker_detail_fragment.xml rename to src/main/res/layout/marker_detail_fragment.xml diff --git a/myTracks/src/main/res/layout/marker_edit.xml b/src/main/res/layout/marker_edit.xml similarity index 100% rename from myTracks/src/main/res/layout/marker_edit.xml rename to src/main/res/layout/marker_edit.xml diff --git a/myTracks/src/main/res/layout/marker_edit_buttons.xml b/src/main/res/layout/marker_edit_buttons.xml similarity index 100% rename from myTracks/src/main/res/layout/marker_edit_buttons.xml rename to src/main/res/layout/marker_edit_buttons.xml diff --git a/myTracks/src/main/res/layout/marker_list.xml b/src/main/res/layout/marker_list.xml similarity index 100% rename from myTracks/src/main/res/layout/marker_list.xml rename to src/main/res/layout/marker_list.xml diff --git a/myTracks/src/main/res/layout/search_list.xml b/src/main/res/layout/search_list.xml similarity index 100% rename from myTracks/src/main/res/layout/search_list.xml rename to src/main/res/layout/search_list.xml diff --git a/myTracks/src/main/res/layout/sensor_state.xml b/src/main/res/layout/sensor_state.xml similarity index 100% rename from myTracks/src/main/res/layout/sensor_state.xml rename to src/main/res/layout/sensor_state.xml diff --git a/myTracks/src/main/res/layout/stats.xml b/src/main/res/layout/stats.xml similarity index 100% rename from myTracks/src/main/res/layout/stats.xml rename to src/main/res/layout/stats.xml diff --git a/myTracks/src/main/res/layout/stats_activity_type.xml b/src/main/res/layout/stats_activity_type.xml similarity index 100% rename from myTracks/src/main/res/layout/stats_activity_type.xml rename to src/main/res/layout/stats_activity_type.xml diff --git a/myTracks/src/main/res/layout/stats_content.xml b/src/main/res/layout/stats_content.xml similarity index 89% rename from myTracks/src/main/res/layout/stats_content.xml rename to src/main/res/layout/stats_content.xml index 4fc3b6550..70ea89c57 100644 --- a/myTracks/src/main/res/layout/stats_content.xml +++ b/src/main/res/layout/stats_content.xml @@ -134,19 +134,31 @@ limitations under the License. android:id="@+id/stats_longitude" layout="@layout/stats_small_item" /> - + + + android:layout_width="match_parent" + android:layout_height="wrap_content"> + - + layout="@layout/stats_large_item" /> + + + + + + + + \ No newline at end of file diff --git a/myTracks/src/main/res/layout/stats_large_item.xml b/src/main/res/layout/stats_large_item.xml similarity index 100% rename from myTracks/src/main/res/layout/stats_large_item.xml rename to src/main/res/layout/stats_large_item.xml diff --git a/myTracks/src/main/res/layout/stats_small_group_item.xml b/src/main/res/layout/stats_small_group_item.xml similarity index 100% rename from myTracks/src/main/res/layout/stats_small_group_item.xml rename to src/main/res/layout/stats_small_group_item.xml diff --git a/myTracks/src/main/res/layout/stats_small_item.xml b/src/main/res/layout/stats_small_item.xml similarity index 100% rename from myTracks/src/main/res/layout/stats_small_item.xml rename to src/main/res/layout/stats_small_item.xml diff --git a/src/main/res/layout/stats_tiny_item.xml b/src/main/res/layout/stats_tiny_item.xml new file mode 100644 index 000000000..6ce3721dc --- /dev/null +++ b/src/main/res/layout/stats_tiny_item.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/myTracks/src/main/res/layout/track_controller.xml b/src/main/res/layout/track_controller.xml similarity index 100% rename from myTracks/src/main/res/layout/track_controller.xml rename to src/main/res/layout/track_controller.xml diff --git a/myTracks/src/main/res/layout/track_detail.xml b/src/main/res/layout/track_detail.xml similarity index 100% rename from myTracks/src/main/res/layout/track_detail.xml rename to src/main/res/layout/track_detail.xml diff --git a/myTracks/src/main/res/layout/track_details_tab.xml b/src/main/res/layout/track_details_tab.xml similarity index 100% rename from myTracks/src/main/res/layout/track_details_tab.xml rename to src/main/res/layout/track_details_tab.xml diff --git a/myTracks/src/main/res/layout/track_edit.xml b/src/main/res/layout/track_edit.xml similarity index 100% rename from myTracks/src/main/res/layout/track_edit.xml rename to src/main/res/layout/track_edit.xml diff --git a/myTracks/src/main/res/layout/track_edit_buttons.xml b/src/main/res/layout/track_edit_buttons.xml similarity index 100% rename from myTracks/src/main/res/layout/track_edit_buttons.xml rename to src/main/res/layout/track_edit_buttons.xml diff --git a/myTracks/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml similarity index 100% rename from myTracks/src/main/res/layout/track_list.xml rename to src/main/res/layout/track_list.xml diff --git a/myTracks/src/main/res/layout/track_widget_4x1.xml b/src/main/res/layout/track_widget_4x1.xml similarity index 100% rename from myTracks/src/main/res/layout/track_widget_4x1.xml rename to src/main/res/layout/track_widget_4x1.xml diff --git a/myTracks/src/main/res/layout/track_widget_4x2.xml b/src/main/res/layout/track_widget_4x2.xml similarity index 100% rename from myTracks/src/main/res/layout/track_widget_4x2.xml rename to src/main/res/layout/track_widget_4x2.xml diff --git a/myTracks/src/main/res/layout/track_widget_4x3.xml b/src/main/res/layout/track_widget_4x3.xml similarity index 100% rename from myTracks/src/main/res/layout/track_widget_4x3.xml rename to src/main/res/layout/track_widget_4x3.xml diff --git a/myTracks/src/main/res/layout/track_widget_4x4.xml b/src/main/res/layout/track_widget_4x4.xml similarity index 100% rename from myTracks/src/main/res/layout/track_widget_4x4.xml rename to src/main/res/layout/track_widget_4x4.xml diff --git a/myTracks/src/main/res/layout/track_widget_config.xml b/src/main/res/layout/track_widget_config.xml similarity index 100% rename from myTracks/src/main/res/layout/track_widget_config.xml rename to src/main/res/layout/track_widget_config.xml diff --git a/myTracks/src/main/res/layout/track_widget_config_buttons.xml b/src/main/res/layout/track_widget_config_buttons.xml similarity index 100% rename from myTracks/src/main/res/layout/track_widget_config_buttons.xml rename to src/main/res/layout/track_widget_config_buttons.xml diff --git a/myTracks/src/main/res/menu/list_context_menu.xml b/src/main/res/menu/list_context_menu.xml similarity index 100% rename from myTracks/src/main/res/menu/list_context_menu.xml rename to src/main/res/menu/list_context_menu.xml diff --git a/myTracks/src/main/res/menu/marker_detail.xml b/src/main/res/menu/marker_detail.xml similarity index 100% rename from myTracks/src/main/res/menu/marker_detail.xml rename to src/main/res/menu/marker_detail.xml diff --git a/myTracks/src/main/res/menu/marker_list.xml b/src/main/res/menu/marker_list.xml similarity index 100% rename from myTracks/src/main/res/menu/marker_list.xml rename to src/main/res/menu/marker_list.xml diff --git a/myTracks/src/main/res/menu/search_list.xml b/src/main/res/menu/search_list.xml similarity index 100% rename from myTracks/src/main/res/menu/search_list.xml rename to src/main/res/menu/search_list.xml diff --git a/myTracks/src/main/res/menu/track_detail.xml b/src/main/res/menu/track_detail.xml similarity index 100% rename from myTracks/src/main/res/menu/track_detail.xml rename to src/main/res/menu/track_detail.xml diff --git a/myTracks/src/main/res/menu/track_list.xml b/src/main/res/menu/track_list.xml similarity index 100% rename from myTracks/src/main/res/menu/track_list.xml rename to src/main/res/menu/track_list.xml diff --git a/myTracks/src/main/res/values-ar-rXB/strings.xml b/src/main/res/values-ar-rXB/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ar-rXB/strings.xml rename to src/main/res/values-ar-rXB/strings.xml diff --git a/myTracks/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ar/strings.xml rename to src/main/res/values-ar/strings.xml diff --git a/myTracks/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml similarity index 100% rename from myTracks/src/main/res/values-bg/strings.xml rename to src/main/res/values-bg/strings.xml diff --git a/myTracks/src/main/res/values-bn/strings.xml b/src/main/res/values-bn/strings.xml similarity index 100% rename from myTracks/src/main/res/values-bn/strings.xml rename to src/main/res/values-bn/strings.xml diff --git a/myTracks/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ca/strings.xml rename to src/main/res/values-ca/strings.xml diff --git a/myTracks/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml similarity index 100% rename from myTracks/src/main/res/values-cs/strings.xml rename to src/main/res/values-cs/strings.xml diff --git a/myTracks/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml similarity index 100% rename from myTracks/src/main/res/values-da/strings.xml rename to src/main/res/values-da/strings.xml diff --git a/myTracks/src/main/res/values-de-rAT/strings.xml b/src/main/res/values-de-rAT/strings.xml similarity index 100% rename from myTracks/src/main/res/values-de-rAT/strings.xml rename to src/main/res/values-de-rAT/strings.xml diff --git a/myTracks/src/main/res/values-de-rCH/strings.xml b/src/main/res/values-de-rCH/strings.xml similarity index 100% rename from myTracks/src/main/res/values-de-rCH/strings.xml rename to src/main/res/values-de-rCH/strings.xml diff --git a/myTracks/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml similarity index 100% rename from myTracks/src/main/res/values-de/strings.xml rename to src/main/res/values-de/strings.xml diff --git a/myTracks/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml similarity index 100% rename from myTracks/src/main/res/values-el/strings.xml rename to src/main/res/values-el/strings.xml diff --git a/myTracks/src/main/res/values-en-rGB/strings.xml b/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from myTracks/src/main/res/values-en-rGB/strings.xml rename to src/main/res/values-en-rGB/strings.xml diff --git a/myTracks/src/main/res/values-en-rIE/strings.xml b/src/main/res/values-en-rIE/strings.xml similarity index 100% rename from myTracks/src/main/res/values-en-rIE/strings.xml rename to src/main/res/values-en-rIE/strings.xml diff --git a/myTracks/src/main/res/values-en-rIN/strings.xml b/src/main/res/values-en-rIN/strings.xml similarity index 100% rename from myTracks/src/main/res/values-en-rIN/strings.xml rename to src/main/res/values-en-rIN/strings.xml diff --git a/myTracks/src/main/res/values-en-rSG/strings.xml b/src/main/res/values-en-rSG/strings.xml similarity index 100% rename from myTracks/src/main/res/values-en-rSG/strings.xml rename to src/main/res/values-en-rSG/strings.xml diff --git a/myTracks/src/main/res/values-en-rXA/strings.xml b/src/main/res/values-en-rXA/strings.xml similarity index 100% rename from myTracks/src/main/res/values-en-rXA/strings.xml rename to src/main/res/values-en-rXA/strings.xml diff --git a/myTracks/src/main/res/values-en-rXC/strings.xml b/src/main/res/values-en-rXC/strings.xml similarity index 100% rename from myTracks/src/main/res/values-en-rXC/strings.xml rename to src/main/res/values-en-rXC/strings.xml diff --git a/myTracks/src/main/res/values-en-rZA/strings.xml b/src/main/res/values-en-rZA/strings.xml similarity index 100% rename from myTracks/src/main/res/values-en-rZA/strings.xml rename to src/main/res/values-en-rZA/strings.xml diff --git a/myTracks/src/main/res/values-es-rAR/strings.xml b/src/main/res/values-es-rAR/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rAR/strings.xml rename to src/main/res/values-es-rAR/strings.xml diff --git a/myTracks/src/main/res/values-es-rBO/strings.xml b/src/main/res/values-es-rBO/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rBO/strings.xml rename to src/main/res/values-es-rBO/strings.xml diff --git a/myTracks/src/main/res/values-es-rCL/strings.xml b/src/main/res/values-es-rCL/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rCL/strings.xml rename to src/main/res/values-es-rCL/strings.xml diff --git a/myTracks/src/main/res/values-es-rCO/strings.xml b/src/main/res/values-es-rCO/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rCO/strings.xml rename to src/main/res/values-es-rCO/strings.xml diff --git a/myTracks/src/main/res/values-es-rCR/strings.xml b/src/main/res/values-es-rCR/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rCR/strings.xml rename to src/main/res/values-es-rCR/strings.xml diff --git a/myTracks/src/main/res/values-es-rDO/strings.xml b/src/main/res/values-es-rDO/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rDO/strings.xml rename to src/main/res/values-es-rDO/strings.xml diff --git a/myTracks/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rEC/strings.xml rename to src/main/res/values-es-rEC/strings.xml diff --git a/myTracks/src/main/res/values-es-rGT/strings.xml b/src/main/res/values-es-rGT/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rGT/strings.xml rename to src/main/res/values-es-rGT/strings.xml diff --git a/myTracks/src/main/res/values-es-rHN/strings.xml b/src/main/res/values-es-rHN/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rHN/strings.xml rename to src/main/res/values-es-rHN/strings.xml diff --git a/myTracks/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rMX/strings.xml rename to src/main/res/values-es-rMX/strings.xml diff --git a/myTracks/src/main/res/values-es-rNI/strings.xml b/src/main/res/values-es-rNI/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rNI/strings.xml rename to src/main/res/values-es-rNI/strings.xml diff --git a/myTracks/src/main/res/values-es-rPA/strings.xml b/src/main/res/values-es-rPA/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rPA/strings.xml rename to src/main/res/values-es-rPA/strings.xml diff --git a/myTracks/src/main/res/values-es-rPE/strings.xml b/src/main/res/values-es-rPE/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rPE/strings.xml rename to src/main/res/values-es-rPE/strings.xml diff --git a/myTracks/src/main/res/values-es-rPR/strings.xml b/src/main/res/values-es-rPR/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rPR/strings.xml rename to src/main/res/values-es-rPR/strings.xml diff --git a/myTracks/src/main/res/values-es-rPY/strings.xml b/src/main/res/values-es-rPY/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rPY/strings.xml rename to src/main/res/values-es-rPY/strings.xml diff --git a/myTracks/src/main/res/values-es-rSV/strings.xml b/src/main/res/values-es-rSV/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rSV/strings.xml rename to src/main/res/values-es-rSV/strings.xml diff --git a/myTracks/src/main/res/values-es-rUS/strings.xml b/src/main/res/values-es-rUS/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rUS/strings.xml rename to src/main/res/values-es-rUS/strings.xml diff --git a/myTracks/src/main/res/values-es-rUY/strings.xml b/src/main/res/values-es-rUY/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rUY/strings.xml rename to src/main/res/values-es-rUY/strings.xml diff --git a/myTracks/src/main/res/values-es-rVE/strings.xml b/src/main/res/values-es-rVE/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es-rVE/strings.xml rename to src/main/res/values-es-rVE/strings.xml diff --git a/myTracks/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml similarity index 100% rename from myTracks/src/main/res/values-es/strings.xml rename to src/main/res/values-es/strings.xml diff --git a/myTracks/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml similarity index 100% rename from myTracks/src/main/res/values-et/strings.xml rename to src/main/res/values-et/strings.xml diff --git a/myTracks/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml similarity index 100% rename from myTracks/src/main/res/values-eu/strings.xml rename to src/main/res/values-eu/strings.xml diff --git a/myTracks/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml similarity index 100% rename from myTracks/src/main/res/values-fa/strings.xml rename to src/main/res/values-fa/strings.xml diff --git a/myTracks/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml similarity index 100% rename from myTracks/src/main/res/values-fi/strings.xml rename to src/main/res/values-fi/strings.xml diff --git a/myTracks/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml similarity index 100% rename from myTracks/src/main/res/values-fr-rCA/strings.xml rename to src/main/res/values-fr-rCA/strings.xml diff --git a/myTracks/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml similarity index 100% rename from myTracks/src/main/res/values-fr-rCH/strings.xml rename to src/main/res/values-fr-rCH/strings.xml diff --git a/myTracks/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml similarity index 100% rename from myTracks/src/main/res/values-fr/strings.xml rename to src/main/res/values-fr/strings.xml diff --git a/myTracks/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml similarity index 100% rename from myTracks/src/main/res/values-gl/strings.xml rename to src/main/res/values-gl/strings.xml diff --git a/myTracks/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml similarity index 100% rename from myTracks/src/main/res/values-hi/strings.xml rename to src/main/res/values-hi/strings.xml diff --git a/myTracks/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml similarity index 100% rename from myTracks/src/main/res/values-hr/strings.xml rename to src/main/res/values-hr/strings.xml diff --git a/myTracks/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml similarity index 100% rename from myTracks/src/main/res/values-hu/strings.xml rename to src/main/res/values-hu/strings.xml diff --git a/myTracks/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml similarity index 100% rename from myTracks/src/main/res/values-in/strings.xml rename to src/main/res/values-in/strings.xml diff --git a/myTracks/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml similarity index 100% rename from myTracks/src/main/res/values-it/strings.xml rename to src/main/res/values-it/strings.xml diff --git a/myTracks/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml similarity index 100% rename from myTracks/src/main/res/values-iw/strings.xml rename to src/main/res/values-iw/strings.xml diff --git a/myTracks/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ja/strings.xml rename to src/main/res/values-ja/strings.xml diff --git a/myTracks/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ko/strings.xml rename to src/main/res/values-ko/strings.xml diff --git a/myTracks/src/main/res/values-ln/strings.xml b/src/main/res/values-ln/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ln/strings.xml rename to src/main/res/values-ln/strings.xml diff --git a/myTracks/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml similarity index 100% rename from myTracks/src/main/res/values-lt/strings.xml rename to src/main/res/values-lt/strings.xml diff --git a/myTracks/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml similarity index 100% rename from myTracks/src/main/res/values-lv/strings.xml rename to src/main/res/values-lv/strings.xml diff --git a/myTracks/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml similarity index 100% rename from myTracks/src/main/res/values-mo/strings.xml rename to src/main/res/values-mo/strings.xml diff --git a/myTracks/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ms/strings.xml rename to src/main/res/values-ms/strings.xml diff --git a/myTracks/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml similarity index 100% rename from myTracks/src/main/res/values-nb/strings.xml rename to src/main/res/values-nb/strings.xml diff --git a/myTracks/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml similarity index 100% rename from myTracks/src/main/res/values-nl/strings.xml rename to src/main/res/values-nl/strings.xml diff --git a/myTracks/src/main/res/values-no/strings.xml b/src/main/res/values-no/strings.xml similarity index 100% rename from myTracks/src/main/res/values-no/strings.xml rename to src/main/res/values-no/strings.xml diff --git a/myTracks/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml similarity index 100% rename from myTracks/src/main/res/values-pl/strings.xml rename to src/main/res/values-pl/strings.xml diff --git a/myTracks/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from myTracks/src/main/res/values-pt-rBR/strings.xml rename to src/main/res/values-pt-rBR/strings.xml diff --git a/myTracks/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from myTracks/src/main/res/values-pt-rPT/strings.xml rename to src/main/res/values-pt-rPT/strings.xml diff --git a/myTracks/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml similarity index 100% rename from myTracks/src/main/res/values-pt/strings.xml rename to src/main/res/values-pt/strings.xml diff --git a/myTracks/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ro/strings.xml rename to src/main/res/values-ro/strings.xml diff --git a/myTracks/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml similarity index 100% rename from myTracks/src/main/res/values-ru/strings.xml rename to src/main/res/values-ru/strings.xml diff --git a/myTracks/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml similarity index 100% rename from myTracks/src/main/res/values-sk/strings.xml rename to src/main/res/values-sk/strings.xml diff --git a/myTracks/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml similarity index 100% rename from myTracks/src/main/res/values-sl/strings.xml rename to src/main/res/values-sl/strings.xml diff --git a/myTracks/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml similarity index 100% rename from myTracks/src/main/res/values-sr/strings.xml rename to src/main/res/values-sr/strings.xml diff --git a/myTracks/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml similarity index 100% rename from myTracks/src/main/res/values-sv/strings.xml rename to src/main/res/values-sv/strings.xml diff --git a/myTracks/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml similarity index 100% rename from myTracks/src/main/res/values-th/strings.xml rename to src/main/res/values-th/strings.xml diff --git a/myTracks/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml similarity index 100% rename from myTracks/src/main/res/values-tl/strings.xml rename to src/main/res/values-tl/strings.xml diff --git a/myTracks/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml similarity index 100% rename from myTracks/src/main/res/values-tr/strings.xml rename to src/main/res/values-tr/strings.xml diff --git a/myTracks/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml similarity index 100% rename from myTracks/src/main/res/values-uk/strings.xml rename to src/main/res/values-uk/strings.xml diff --git a/myTracks/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml similarity index 100% rename from myTracks/src/main/res/values-vi/strings.xml rename to src/main/res/values-vi/strings.xml diff --git a/myTracks/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from myTracks/src/main/res/values-zh-rCN/strings.xml rename to src/main/res/values-zh-rCN/strings.xml diff --git a/myTracks/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from myTracks/src/main/res/values-zh-rHK/strings.xml rename to src/main/res/values-zh-rHK/strings.xml diff --git a/myTracks/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from myTracks/src/main/res/values-zh-rTW/strings.xml rename to src/main/res/values-zh-rTW/strings.xml diff --git a/myTracks/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml similarity index 100% rename from myTracks/src/main/res/values-zh/strings.xml rename to src/main/res/values-zh/strings.xml diff --git a/myTracks/src/main/res/values/.gitignore b/src/main/res/values/.gitignore similarity index 100% rename from myTracks/src/main/res/values/.gitignore rename to src/main/res/values/.gitignore diff --git a/myTracks/src/main/res/values/arrays_do_not_translate.xml b/src/main/res/values/arrays_do_not_translate.xml similarity index 100% rename from myTracks/src/main/res/values/arrays_do_not_translate.xml rename to src/main/res/values/arrays_do_not_translate.xml diff --git a/myTracks/src/main/res/values/colors.xml b/src/main/res/values/colors.xml similarity index 100% rename from myTracks/src/main/res/values/colors.xml rename to src/main/res/values/colors.xml diff --git a/myTracks/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml similarity index 100% rename from myTracks/src/main/res/values/dimens.xml rename to src/main/res/values/dimens.xml diff --git a/myTracks/src/main/res/values/do_not_translate.xml b/src/main/res/values/do_not_translate.xml similarity index 100% rename from myTracks/src/main/res/values/do_not_translate.xml rename to src/main/res/values/do_not_translate.xml diff --git a/myTracks/src/main/res/values/keys.xml b/src/main/res/values/keys.xml similarity index 100% rename from myTracks/src/main/res/values/keys.xml rename to src/main/res/values/keys.xml diff --git a/myTracks/src/main/res/values/plurals.xml b/src/main/res/values/plurals.xml similarity index 100% rename from myTracks/src/main/res/values/plurals.xml rename to src/main/res/values/plurals.xml diff --git a/myTracks/src/main/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 100% rename from myTracks/src/main/res/values/strings.xml rename to src/main/res/values/strings.xml diff --git a/myTracks/src/main/res/values/styles.xml b/src/main/res/values/styles.xml similarity index 98% rename from myTracks/src/main/res/values/styles.xml rename to src/main/res/values/styles.xml index 8ab8c11f1..9dd97aba0 100644 --- a/myTracks/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -207,6 +207,12 @@ limitations under the License. true @android:color/white + +