From 0d4d1769f003504011af4e3192c6ef1fe0662bbc Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Tue, 2 Jul 2019 22:07:29 +0200 Subject: [PATCH] Upgraded project to AndroidX. --- gradle.properties | 2 + myTracks/build.gradle | 62 +++++++++---------- .../mytracks/AbstractMyTracksActivity.java | 2 +- .../apps/mytracks/ChartValueSeries.java | 2 +- .../android/apps/mytracks/ChartView.java | 3 +- .../apps/mytracks/MarkerDetailActivity.java | 8 +-- .../apps/mytracks/MarkerListActivity.java | 8 +-- .../SectionResourceCursorAdapter.java | 2 +- .../android/apps/mytracks/TabsAdapter.java | 8 +-- .../apps/mytracks/TrackDetailActivity.java | 4 +- .../apps/mytracks/TrackListActivity.java | 6 +- .../content/DescriptionGeneratorImpl.java | 2 +- .../mytracks/content/MyTracksProvider.java | 2 +- .../apps/mytracks/content/TrackDataHub.java | 2 +- .../AbstractMyTracksDialogFragment.java | 4 +- .../mytracks/fragments/ChartFragment.java | 6 +- .../ChooseActivityDialogFragment.java | 6 +- .../ChooseActivityTypeDialogFragment.java | 2 +- .../fragments/DeleteMarkerDialogFragment.java | 2 +- .../fragments/FrequencyDialogFragment.java | 2 +- .../fragments/MarkerDetailFragment.java | 4 +- .../mytracks/fragments/StatsFragment.java | 4 +- .../io/file/exporter/KmlTrackWriter.java | 2 +- .../file/importer/GpxFileTrackImporter.java | 2 +- .../io/file/importer/ImportActivity.java | 2 +- .../file/importer/KmlFileTrackImporter.java | 2 +- .../services/ControlRecordingService.java | 2 +- .../services/MyTracksLocationManager.java | 2 +- .../services/TrackRecordingService.java | 8 +-- .../tasks/AnnouncementPeriodicTask.java | 2 +- .../mytracks/stats/TripStatisticsUpdater.java | 2 +- .../apps/mytracks/util/TrackIconUtils.java | 2 +- .../apps/mytracks/util/TrackNameUtils.java | 2 +- .../mytracks/widgets/TrackWidgetProvider.java | 2 +- .../res/layout/marker_detail_activity.xml | 2 +- .../src/main/res/layout/track_details_tab.xml | 2 +- myTracks/src/main/res/menu/marker_list.xml | 2 +- myTracks/src/main/res/menu/search_list.xml | 2 +- myTracks/src/main/res/menu/track_list.xml | 4 +- 39 files changed, 93 insertions(+), 92 deletions(-) create mode 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..5465fec0e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/myTracks/build.gradle b/myTracks/build.gradle index 2aca26ae5..c5a0263c7 100644 --- a/myTracks/build.gradle +++ b/myTracks/build.gradle @@ -1,31 +1,31 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 26 - - defaultConfig { - applicationId "com.google.android.maps.mytracks" - minSdkVersion 21 - targetSdkVersion 26 - - testApplicationId "com.google.android.maps.mytracks.test" - testInstrumentationRunner "android.test.InstrumentationTestRunner" - } - - buildTypes { - release { - minifyEnabled true - proguardFiles 'proguard.cfg', 'proguard-google-api-client.txt' - } - } -} - -dependencies { - implementation project(':myTracksLib') - androidTestCompile files('libs/AndroidMockGenerator.jar') - androidTestCompile files('libs/robotium-solo-5.0.1.jar') - - implementation 'com.google.android.gms:play-services-location:11.8.0' - implementation 'com.google.android.gms:play-services:11.8.0' - implementation 'com.google.android.gms:play-services-auth:11.8.0' -} +apply plugin: 'com.android.application' + +android { + compileSdkVersion 28 + + defaultConfig { + applicationId "com.google.android.maps.mytracks" + minSdkVersion 21 + targetSdkVersion 28 + + testApplicationId "com.google.android.maps.mytracks.test" + testInstrumentationRunner "android.test.InstrumentationTestRunner" + } + + buildTypes { + release { + minifyEnabled true + proguardFiles 'proguard.cfg', 'proguard-google-api-client.txt' + } + } +} + +dependencies { + implementation project(':myTracksLib') + androidTestCompile files('libs/AndroidMockGenerator.jar') + androidTestCompile files('libs/robotium-solo-5.0.1.jar') + + implementation 'com.google.android.gms:play-services-location:11.8.0' + implementation 'com.google.android.gms:play-services:11.8.0' + implementation 'com.google.android.gms:play-services-auth:11.8.0' +} diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractMyTracksActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractMyTracksActivity.java index e4c3353f0..f3ce9e7cd 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractMyTracksActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/AbstractMyTracksActivity.java @@ -21,7 +21,7 @@ import com.google.android.apps.mytracks.util.TrackIconUtils; import android.app.ActionBar; import android.os.Bundle; import android.speech.tts.TextToSpeech; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.view.Menu; import android.view.MenuItem; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java b/myTracks/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java index 3c95943d6..65d96264b 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/ChartValueSeries.java @@ -22,7 +22,7 @@ import android.graphics.Paint; import android.graphics.Paint.Align; import android.graphics.Paint.Style; import android.graphics.Path; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.google.android.apps.mytracks.stats.ExtremityMonitor; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java b/myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java index 458c7fcb0..0e0ae1c18 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/ChartView.java @@ -27,7 +27,7 @@ import android.graphics.Paint.Style; import android.graphics.Path; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; @@ -35,7 +35,6 @@ import android.view.ViewConfiguration; import android.widget.Scroller; import com.google.android.apps.mytracks.content.Waypoint; -import com.google.android.apps.mytracks.content.Waypoint.WaypointType; import com.google.android.apps.mytracks.stats.ExtremityMonitor; import com.google.android.apps.mytracks.util.IntentUtils; import com.google.android.apps.mytracks.util.StringUtils; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java index 6e73bfd8f..e928db288 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerDetailActivity.java @@ -24,10 +24,10 @@ import com.google.android.maps.mytracks.R; import android.database.Cursor; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.Log; import java.util.ArrayList; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java index db8ca2c3c..e0d8c9fcd 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/MarkerListActivity.java @@ -33,10 +33,10 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.database.Cursor; import android.os.Bundle; -import android.support.v4.app.LoaderManager.LoaderCallbacks; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; -import android.support.v4.widget.ResourceCursorAdapter; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.ResourceCursorAdapter; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/SectionResourceCursorAdapter.java b/myTracks/src/main/java/com/google/android/apps/mytracks/SectionResourceCursorAdapter.java index f16cd9d40..fc45d3b66 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/SectionResourceCursorAdapter.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/SectionResourceCursorAdapter.java @@ -21,7 +21,7 @@ import com.google.android.maps.mytracks.R; import android.content.Context; import android.database.Cursor; -import android.support.v4.widget.ResourceCursorAdapter; +import androidx.cursoradapter.widget.ResourceCursorAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java index f7a696ee7..c6a2aa8be 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TabsAdapter.java @@ -18,10 +18,10 @@ package com.google.android.apps.mytracks; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.View; import android.view.ViewGroup; import android.widget.TabHost; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java index 89c5f7ac5..cfddd6c36 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackDetailActivity.java @@ -48,8 +48,8 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; -import android.support.v4.app.TaskStackBuilder; -import android.support.v4.view.ViewPager; +import androidx.core.app.TaskStackBuilder; +import androidx.viewpager.widget.ViewPager; import android.view.Menu; import android.view.MenuItem; import android.view.MotionEvent; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java index a08ad2a3a..c6b68244f 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/TrackListActivity.java @@ -29,9 +29,9 @@ import android.os.Looper; import android.os.Parcelable; import android.os.RemoteException; import android.os.StrictMode; -import android.support.v4.app.LoaderManager.LoaderCallbacks; -import android.support.v4.content.CursorLoader; -import android.support.v4.content.Loader; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java index a4b5672d8..244e06415 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/content/DescriptionGeneratorImpl.java @@ -17,7 +17,7 @@ package com.google.android.apps.mytracks.content; import android.content.Context; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.util.StringUtils; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java index a82644662..1077d5d37 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/content/MyTracksProvider.java @@ -32,7 +32,7 @@ import android.net.Uri; import android.os.Binder; import android.os.ParcelFileDescriptor; import android.os.Process; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java index 11879df0e..a1583a385 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/content/TrackDataHub.java @@ -21,7 +21,7 @@ import android.database.Cursor; import android.location.Location; import android.os.Handler; import android.os.HandlerThread; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import com.google.android.apps.mytracks.content.MyTracksProviderUtils.LocationIterator; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java index 06935e4d9..ae58e263d 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/AbstractMyTracksDialogFragment.java @@ -21,8 +21,8 @@ import com.google.android.apps.mytracks.util.DialogUtils; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; /** * Abstract My Tracks DialogFragment. diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java index f6ac63e26..ddb691333 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChartFragment.java @@ -18,9 +18,9 @@ package com.google.android.apps.mytracks.fragments; import android.location.Location; import android.os.Bundle; -import android.support.annotation.VisibleForTesting; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.VisibleForTesting; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java index d9532c8ae..40954cc38 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityDialogFragment.java @@ -28,9 +28,9 @@ import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.ShareCompat; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentActivity; +import androidx.core.app.ShareCompat; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java index d29ddb791..d538db5e9 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java @@ -29,7 +29,7 @@ import android.content.DialogInterface; import android.graphics.BitmapFactory; import android.graphics.BitmapFactory.Options; import android.os.Bundle; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java index 1119db7b8..86581dbdc 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/DeleteMarkerDialogFragment.java @@ -25,7 +25,7 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; /** * A DialogFragment to delete marker. diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java index cce824486..0a760893c 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/FrequencyDialogFragment.java @@ -24,7 +24,7 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; /** * A DialogFragment to configure frequency. diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java index dbbfde6f2..f49f25474 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/MarkerDetailFragment.java @@ -37,8 +37,8 @@ import android.location.Location; import android.net.Uri; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.util.Log; import android.view.Display; import android.view.LayoutInflater; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java index 28ae78f18..124906592 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/fragments/StatsFragment.java @@ -35,8 +35,8 @@ import com.google.android.maps.mytracks.R; import android.location.Location; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java index e4790aa4f..3a851d17b 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/exporter/KmlTrackWriter.java @@ -19,7 +19,7 @@ import android.content.Context; import android.database.Cursor; import android.location.Location; import android.net.Uri; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.google.android.apps.mytracks.content.DescriptionGenerator; import com.google.android.apps.mytracks.content.DescriptionGeneratorImpl; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java index 9275a0871..4f06fd703 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/GpxFileTrackImporter.java @@ -18,7 +18,7 @@ package com.google.android.apps.mytracks.io.file.importer; import android.content.Context; import android.location.Location; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.google.android.apps.mytracks.content.MyTracksProviderUtils; import com.google.android.apps.mytracks.content.Waypoint.WaypointType; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java index c9d5a3e70..9667334e1 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/ImportActivity.java @@ -32,7 +32,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.TaskStackBuilder; +import androidx.core.app.TaskStackBuilder; import android.util.Log; import android.widget.Toast; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java index 281c17807..38928eff4 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/io/file/importer/KmlFileTrackImporter.java @@ -25,7 +25,7 @@ import com.google.android.apps.mytracks.content.Waypoint.WaypointType; import android.content.Context; import android.location.Location; import android.net.Uri; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import java.util.ArrayList; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java b/myTracks/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java index 1143ce298..64c4a5da3 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/services/ControlRecordingService.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; import android.os.RemoteException; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import com.google.android.apps.mytracks.widgets.TrackWidgetProvider; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java b/myTracks/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java index 2c0595749..ec154a1c7 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/services/MyTracksLocationManager.java @@ -25,7 +25,7 @@ import android.location.LocationManager; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.android.apps.mytracks.util.GoogleLocationUtils; import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java b/myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java index 2644d3c30..287d89f15 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/services/TrackRecordingService.java @@ -31,10 +31,10 @@ import android.os.Handler; import android.os.IBinder; import android.os.PowerManager.WakeLock; import android.os.Process; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.TaskStackBuilder; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.core.app.NotificationCompat; +import androidx.core.app.TaskStackBuilder; import android.util.Log; import com.google.android.apps.mytracks.Constants; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java b/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java index 30a20ccf2..2280c0669 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/services/tasks/AnnouncementPeriodicTask.java @@ -21,7 +21,7 @@ import android.media.AudioManager; import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.OnInitListener; import android.speech.tts.TextToSpeech.OnUtteranceCompletedListener; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.Log; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java b/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java index 33af428c7..b3e2067ff 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/stats/TripStatisticsUpdater.java @@ -17,7 +17,7 @@ package com.google.android.apps.mytracks.stats; import android.location.Location; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import android.util.Log; import com.google.android.apps.mytracks.util.CalorieUtils; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java index 1bc6853db..6676f4896 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java @@ -23,7 +23,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.ColorMatrixColorFilter; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Pair; import android.view.Menu; import android.view.MenuItem; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java index bfbda650a..08191cd5a 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackNameUtils.java @@ -20,7 +20,7 @@ import android.content.Context; import android.location.Address; import android.location.Geocoder; import android.location.Location; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.VisibleForTesting; import com.google.android.maps.mytracks.R; diff --git a/myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java index c392967a0..c55ecfb76 100644 --- a/myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java +++ b/myTracks/src/main/java/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java @@ -37,7 +37,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.SystemClock; -import android.support.v4.app.TaskStackBuilder; +import androidx.core.app.TaskStackBuilder; import android.view.View; import android.widget.RemoteViews; diff --git a/myTracks/src/main/res/layout/marker_detail_activity.xml b/myTracks/src/main/res/layout/marker_detail_activity.xml index 44682aa50..dd5e2806c 100644 --- a/myTracks/src/main/res/layout/marker_detail_activity.xml +++ b/myTracks/src/main/res/layout/marker_detail_activity.xml @@ -17,7 +17,7 @@ limitations under the License. - diff --git a/myTracks/src/main/res/layout/track_details_tab.xml b/myTracks/src/main/res/layout/track_details_tab.xml index 20cd49d7e..f18f1e821 100644 --- a/myTracks/src/main/res/layout/track_details_tab.xml +++ b/myTracks/src/main/res/layout/track_details_tab.xml @@ -29,7 +29,7 @@ limitations under the License. android:layout_height="0dp" android:layout_weight="0" android:layout_width="0dp" /> - + app:actionViewClass="androidx.appcompat.widget.SearchView" /> \ No newline at end of file diff --git a/myTracks/src/main/res/menu/search_list.xml b/myTracks/src/main/res/menu/search_list.xml index 2ff396609..4c7885607 100644 --- a/myTracks/src/main/res/menu/search_list.xml +++ b/myTracks/src/main/res/menu/search_list.xml @@ -20,5 +20,5 @@ limitations under the License. android:id="@+id/search_list_search" android:title="@string/menu_search" app:showAsAction="ifRoom|collapseActionView" - app:actionViewClass="android.widget.SearchView" /> + app:actionViewClass="androidx.appcompat.widget.SearchView" /> \ No newline at end of file diff --git a/myTracks/src/main/res/menu/track_list.xml b/myTracks/src/main/res/menu/track_list.xml index 56aa1a684..e47bca4f1 100644 --- a/myTracks/src/main/res/menu/track_list.xml +++ b/myTracks/src/main/res/menu/track_list.xml @@ -19,8 +19,8 @@ limitations under the License. android:icon="@drawable/ic_menu_search" android:id="@+id/track_list_search" android:title="@string/menu_search" - app:actionViewClass="android.widget.SearchView" - app:showAsAction="ifRoom|collapseActionView" /> + app:actionViewClass="androidx.appcompat.widget.SearchView" + app:showAsAction="always" />