Moved myTrackLib into MyTracks: moved files.

Moved resources from lib to app.

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'
 }

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>

myTracksLib/build.gradle

@@ -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'
-}

myTracksLib/lint.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<lint>
-    <issue id="UnusedIds" severity="ignore" />
-    <issue id="UnusedResources" severity="ignore" />
-</lint>

myTracksLib/src/main/AndroidManifest.xml

@@ -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>

myTracksLib/src/main/res/values/strings.xml

@@ -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>

settings.gradle

@@ -1 +1 @@
-include ':myTracks', ':myTracksLib'
+include ':myTracks'