diff options
author | Jeremy Walker <jewalker@google.com> | 2019-04-02 10:02:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-02 10:02:10 -0700 |
commit | d3724f77e34d4c895fb77ac2dd7aa11fbbbd7812 (patch) | |
tree | 97ef789e5d6955674f7414fafea77a10ea43d1cf | |
parent | 5120aa588c4633383b3a80597895140e51cc59f9 (diff) | |
parent | e678e4367e535287cab52ecef605ec67870f5796 (diff) | |
download | android-d3724f77e34d4c895fb77ac2dd7aa11fbbbd7812.tar.gz |
Speedtracker: Updates to androidx and latest libraries.
am: e678e4367e
Change-Id: If4ec32a8f7d31d051f034570cfee06e31ab543a1
7 files changed, 42 insertions, 42 deletions
diff --git a/wearable/wear/SpeedTracker/Application/src/main/AndroidManifest.xml b/wearable/wear/SpeedTracker/Application/src/main/AndroidManifest.xml index bf86a10c..09bf9d17 100644 --- a/wearable/wear/SpeedTracker/Application/src/main/AndroidManifest.xml +++ b/wearable/wear/SpeedTracker/Application/src/main/AndroidManifest.xml @@ -3,10 +3,6 @@ package="com.example.android.wearable.speedtracker" > - <uses-sdk - android:minSdkVersion="18" - android:targetSdkVersion="25" /> - <!-- BEGIN_INCLUDE(manifest) --> <!-- Note that all required permissions are declared here in the Android manifest. diff --git a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java index b915d26d..4f9ea723 100644 --- a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java +++ b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java @@ -16,25 +16,25 @@ package com.example.android.wearable.speedtracker; -import com.google.android.gms.maps.CameraUpdateFactory; -import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.SupportMapFragment; -import com.google.android.gms.maps.OnMapReadyCallback; -import com.google.android.gms.maps.model.LatLng; -import com.google.android.gms.maps.model.LatLngBounds; -import com.google.android.gms.maps.model.PolylineOptions; - import android.app.DatePickerDialog; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.text.format.DateUtils; import android.util.Log; import android.view.View; import android.widget.DatePicker; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.example.android.wearable.speedtracker.common.LocationEntry; +import com.google.android.gms.maps.CameraUpdateFactory; +import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.LatLng; +import com.google.android.gms.maps.model.LatLngBounds; +import com.google.android.gms.maps.model.PolylineOptions; import java.util.ArrayList; import java.util.Calendar; diff --git a/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml b/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml index feb2b813..9b16916f 100644 --- a/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml +++ b/wearable/wear/SpeedTracker/Wearable/src/main/AndroidManifest.xml @@ -22,10 +22,6 @@ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.WAKE_LOCK" /> - <uses-sdk - android:minSdkVersion="20" - android:targetSdkVersion="25" /> - <application android:allowBackup="true" android:icon="@drawable/ic_launcher" diff --git a/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java b/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java index c2e180c1..1437549a 100644 --- a/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java +++ b/wearable/wear/SpeedTracker/Wearable/src/main/java/com/example/android/wearable/speedtracker/WearableMainActivity.java @@ -16,18 +16,6 @@ package com.example.android.wearable.speedtracker; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.api.GoogleApiClient; -import com.google.android.gms.common.api.ResultCallback; -import com.google.android.gms.common.api.Status; -import com.google.android.gms.location.LocationListener; -import com.google.android.gms.location.LocationRequest; -import com.google.android.gms.location.LocationServices; -import com.google.android.gms.wearable.DataApi; -import com.google.android.gms.wearable.PutDataMapRequest; -import com.google.android.gms.wearable.PutDataRequest; -import com.google.android.gms.wearable.Wearable; - import android.Manifest; import android.annotation.SuppressLint; import android.app.AlertDialog; @@ -39,18 +27,30 @@ import android.location.Location; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.ContextCompat; -import android.support.wear.ambient.AmbientModeSupport; import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.FragmentActivity; +import androidx.wear.ambient.AmbientModeSupport; + import com.example.android.wearable.speedtracker.common.Constants; import com.example.android.wearable.speedtracker.common.LocationEntry; +import com.google.android.gms.common.ConnectionResult; +import com.google.android.gms.common.api.GoogleApiClient; +import com.google.android.gms.common.api.ResultCallback; +import com.google.android.gms.common.api.Status; +import com.google.android.gms.location.LocationListener; +import com.google.android.gms.location.LocationRequest; +import com.google.android.gms.location.LocationServices; +import com.google.android.gms.wearable.DataApi; +import com.google.android.gms.wearable.PutDataMapRequest; +import com.google.android.gms.wearable.PutDataRequest; +import com.google.android.gms.wearable.Wearable; import java.util.Calendar; import java.util.concurrent.TimeUnit; diff --git a/wearable/wear/SpeedTracker/Wearable/src/main/res/layout/speed_picker_activity.xml b/wearable/wear/SpeedTracker/Wearable/src/main/res/layout/speed_picker_activity.xml index 27062112..8862db2a 100644 --- a/wearable/wear/SpeedTracker/Wearable/src/main/res/layout/speed_picker_activity.xml +++ b/wearable/wear/SpeedTracker/Wearable/src/main/res/layout/speed_picker_activity.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<android.support.wear.widget.BoxInsetLayout +<androidx.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:background="@android:color/black" @@ -44,4 +44,4 @@ android:layout_alignParentTop="true" android:text="@string/speed_limit_header"/> </RelativeLayout> -</android.support.wear.widget.BoxInsetLayout>
\ No newline at end of file +</androidx.wear.widget.BoxInsetLayout>
\ No newline at end of file diff --git a/wearable/wear/SpeedTracker/gradle.properties b/wearable/wear/SpeedTracker/gradle.properties index 5d08ba75..94f84728 100644 --- a/wearable/wear/SpeedTracker/gradle.properties +++ b/wearable/wear/SpeedTracker/gradle.properties @@ -1,3 +1,4 @@ + # Project-wide Gradle settings. # IDE (e.g. Android Studio) users: @@ -15,4 +16,7 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true
\ No newline at end of file +# org.gradle.parallel=true + +android.useAndroidX=true +android.enableJetifier=true diff --git a/wearable/wear/SpeedTracker/template-params.xml b/wearable/wear/SpeedTracker/template-params.xml index d4d05ca4..85dabf91 100644 --- a/wearable/wear/SpeedTracker/template-params.xml +++ b/wearable/wear/SpeedTracker/template-params.xml @@ -29,12 +29,16 @@ <has_handheld_app>true</has_handheld_app> </wearable> - <dependency>com.android.support:design:27.1.1</dependency> - <dependency_wearable>com.android.support:wear:27.1.1</dependency_wearable> + <androidX>true</androidX> - <dependency>com.google.android.gms:play-services-maps</dependency> - <dependency>com.google.android.gms:play-services-location</dependency> - <dependency_wearable>com.google.android.gms:play-services-location</dependency_wearable> + <dependency>com.google.android.material:material:1.0.0</dependency> + <dependency>androidx.legacy:legacy-support-v13:1.0.0</dependency> + <dependency>com.google.android.gms:play-services-maps:16.1.0</dependency> + <dependency>com.google.android.gms:play-services-location:16.0.0</dependency> + + <dependency_wearable>androidx.wear:wear:1.0.0</dependency_wearable> + <dependency_wearable>androidx.legacy:legacy-support-v13:1.0.0</dependency_wearable> + <dependency_wearable>com.google.android.gms:play-services-location:16.0.0</dependency_wearable> <strings> <intro> |