From 1706e8e8f9f15cded6669d85ecd7bd4de9321ba9 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 15 Jul 2019 21:53:11 +0200
Subject: [PATCH] Moved myTrackLib into MyTracks: moved files.

Moved resources from lib to app.
---
 myTracks/build.gradle                         |   4 +--
 .../apps/mytracks/content/ContentTypeIds.java |   0
 .../content/DescriptionGenerator.java         |   0
 .../mytracks/content/MyTracksLocation.java    |   0
 .../content/MyTracksProviderUtils.java        |   0
 .../content/MyTracksProviderUtilsImpl.java    |   0
 .../android/apps/mytracks/content/Sensor.java |   0
 .../android/apps/mytracks/content/Track.java  |   0
 .../mytracks/content/TrackPointsColumns.java  |   0
 .../apps/mytracks/content/TracksColumns.java  |   0
 .../apps/mytracks/content/Waypoint.aidl       |   0
 .../apps/mytracks/content/Waypoint.java       |   0
 .../content/WaypointCreationRequest.aidl      |   0
 .../content/WaypointCreationRequest.java      |   0
 .../mytracks/content/WaypointsColumns.java    |   0
 .../services/ITrackRecordingService.aidl      |   0
 .../apps/mytracks/stats/ExtremityMonitor.java |   0
 .../apps/mytracks/stats/TripStatistics.aidl   |   0
 .../apps/mytracks/stats/TripStatistics.java   |   0
 .../android/apps/mytracks/util/FileUtils.java |   0
 .../drawable-hdpi/ic_launcher_my_tracks.png   | Bin
 .../drawable-mdpi/ic_launcher_my_tracks.png   | Bin
 .../drawable-xhdpi/ic_launcher_my_tracks.png  | Bin
 .../drawable-xxhdpi/ic_launcher_my_tracks.png | Bin
 .../src/main/res/values/third_party.xml       |   5 ---
 myTracksLib/build.gradle                      |  21 -----------
 myTracksLib/lint.xml                          |   5 ---
 myTracksLib/src/main/AndroidManifest.xml      |  33 ------------------
 myTracksLib/src/main/res/values/strings.xml   |  20 -----------
 settings.gradle                               |   2 +-
 30 files changed, 3 insertions(+), 87 deletions(-)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/Sensor.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/Track.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java (100%)
 rename {myTracksLib/src/main/aidl => myTracks/src/main/java}/com/google/android/apps/mytracks/content/Waypoint.aidl (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java (100%)
 rename {myTracksLib/src/main/aidl => myTracks/src/main/java}/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java (100%)
 rename {myTracksLib/src/main/aidl => myTracks/src/main/java}/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java (100%)
 rename {myTracksLib/src/main/aidl => myTracks/src/main/java}/com/google/android/apps/mytracks/stats/TripStatistics.aidl (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java (100%)
 rename {myTracksLib => myTracks}/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java (100%)
 rename {myTracksLib => myTracks}/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png (100%)
 rename {myTracksLib => myTracks}/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png (100%)
 rename {myTracksLib => myTracks}/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png (100%)
 rename {myTracksLib => myTracks}/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png (100%)
 rename {myTracksLib => myTracks}/src/main/res/values/third_party.xml (77%)
 delete mode 100644 myTracksLib/build.gradle
 delete mode 100644 myTracksLib/lint.xml
 delete mode 100644 myTracksLib/src/main/AndroidManifest.xml
 delete mode 100644 myTracksLib/src/main/res/values/strings.xml

diff --git a/myTracks/build.gradle b/myTracks/build.gradle
index e6091cdf4..42bb25563 100644
--- a/myTracks/build.gradle
+++ b/myTracks/build.gradle
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-    implementation project(':myTracksLib')
-
     implementation 'androidx.appcompat:appcompat:1.0.0'
+
+    implementation 'com.google.protobuf:protobuf-java:2.5.0'
 }
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/ContentTypeIds.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGenerator.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksLocation.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtils.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/Sensor.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/Sensor.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/Sensor.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/Sensor.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/Track.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/Track.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/Track.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/Track.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackPointsColumns.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/TracksColumns.java
diff --git a/myTracksLib/src/main/aidl/com/google/android/apps/mytracks/content/Waypoint.aidl b/myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl
similarity index 100%
rename from myTracksLib/src/main/aidl/com/google/android/apps/mytracks/content/Waypoint.aidl
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.aidl
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/Waypoint.java
diff --git a/myTracksLib/src/main/aidl/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl b/myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl
similarity index 100%
rename from myTracksLib/src/main/aidl/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.aidl
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointCreationRequest.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/content/WaypointsColumns.java
diff --git a/myTracksLib/src/main/aidl/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl b/myTracks/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl
similarity index 100%
rename from myTracksLib/src/main/aidl/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl
rename to myTracks/src/main/java/com/google/android/apps/mytracks/services/ITrackRecordingService.aidl
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java b/myTracks/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/stats/ExtremityMonitor.java
diff --git a/myTracksLib/src/main/aidl/com/google/android/apps/mytracks/stats/TripStatistics.aidl b/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.aidl
similarity index 100%
rename from myTracksLib/src/main/aidl/com/google/android/apps/mytracks/stats/TripStatistics.aidl
rename to myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.aidl
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java b/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatistics.java
diff --git a/myTracksLib/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
similarity index 100%
rename from myTracksLib/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
rename to myTracks/src/main/java/com/google/android/apps/mytracks/util/FileUtils.java
diff --git a/myTracksLib/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png b/myTracks/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from myTracksLib/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png
rename to myTracks/src/main/res/drawable-hdpi/ic_launcher_my_tracks.png
diff --git a/myTracksLib/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png b/myTracks/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from myTracksLib/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png
rename to myTracks/src/main/res/drawable-mdpi/ic_launcher_my_tracks.png
diff --git a/myTracksLib/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png b/myTracks/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from myTracksLib/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png
rename to myTracks/src/main/res/drawable-xhdpi/ic_launcher_my_tracks.png
diff --git a/myTracksLib/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png b/myTracks/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png
similarity index 100%
rename from myTracksLib/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png
rename to myTracks/src/main/res/drawable-xxhdpi/ic_launcher_my_tracks.png
diff --git a/myTracksLib/src/main/res/values/third_party.xml b/myTracks/src/main/res/values/third_party.xml
similarity index 77%
rename from myTracksLib/src/main/res/values/third_party.xml
rename to myTracks/src/main/res/values/third_party.xml
index 5831ba65c..91a3cf310 100644
--- a/myTracksLib/src/main/res/values/third_party.xml
+++ b/myTracks/src/main/res/values/third_party.xml
@@ -18,8 +18,6 @@ limitations under the License.
   <!-- Do not translate -->
   <!-- Permissions, need to be in sync with the permissions in AndroidManifest.xml -->
   <string name="broadcast_notifications_permission">com.google.android.apps.mytracks.TRACK_NOTIFICATIONS</string>
-  <string name="read_track_data_permission">com.google.android.apps.mytracks.READ_TRACK_DATA</string>
-  <string name="write_track_data_permission">com.google.android.apps.mytracks.WRITE_TRACK_DATA</string>
   <!-- Broadcast -->
   <string name="track_id_broadcast_extra">com.google.android.apps.mytracks.TRACK_ID</string>
   <string name="track_paused_broadcast_action">com.google.android.apps.mytracks.TRACK_PAUSED</string>
@@ -27,7 +25,4 @@ limitations under the License.
   <string name="track_started_broadcast_action">com.google.android.apps.mytracks.TRACK_STARTED</string>
   <string name="track_stopped_broadcast_action">com.google.android.apps.mytracks.TRACK_STOPPED</string>
   <string name="track_update_broadcast_action">com.google.android.apps.mytracks.TRACK_UPDATE</string>
-  <!-- My Tracks service -->
-  <string name="mytracks_service_class">com.google.android.apps.mytracks.services.TrackRecordingService</string>
-  <string name="mytracks_service_package">com.google.android.maps.mytracks</string>
 </resources>
\ No newline at end of file
diff --git a/myTracksLib/build.gradle b/myTracksLib/build.gradle
deleted file mode 100644
index 52a037f7a..000000000
--- a/myTracksLib/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 26
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}
-
-dependencies {
-    compile 'com.google.protobuf:protobuf-java:2.5.0'
-}
diff --git a/myTracksLib/lint.xml b/myTracksLib/lint.xml
deleted file mode 100644
index b6e2d25f5..000000000
--- a/myTracksLib/lint.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<lint>
-    <issue id="UnusedIds" severity="ignore" />
-    <issue id="UnusedResources" severity="ignore" />
-</lint>
\ No newline at end of file
diff --git a/myTracksLib/src/main/AndroidManifest.xml b/myTracksLib/src/main/AndroidManifest.xml
deleted file mode 100644
index 18df750b6..000000000
--- a/myTracksLib/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.google.android.apps.mytracks.lib"
-  android:versionCode="1"
-  android:versionName="1.0" >
-
-  <!--
-     THIS IS A LIBRARY PROJECT.
-     See http://developer.android.com/guide/developing/eclipse-adt.html#libraryProject
-     for details on what should go here vs in the application project.
-  -->
-
-  <application
-    android:icon="@drawable/ic_launcher_my_tracks"
-    android:label="@string/lib_name" >
-  </application>
-
-</manifest>
\ No newline at end of file
diff --git a/myTracksLib/src/main/res/values/strings.xml b/myTracksLib/src/main/res/values/strings.xml
deleted file mode 100644
index 3688082e4..000000000
--- a/myTracksLib/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<resources>
-  <!-- Do not translate -->
-  <string name="lib_name">My Tracks Base Library</string>
-</resources>
diff --git a/settings.gradle b/settings.gradle
index ebc8e616a..e62b07472 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':myTracks', ':myTracksLib'
\ No newline at end of file
+include ':myTracks'
\ No newline at end of file