diff options
author | Jeremy Walker <jewalker@google.com> | 2019-04-02 10:21:05 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-02 10:21:05 -0700 |
commit | f2af34555789e7ae24f7b15df28e802fcf7bc082 (patch) | |
tree | e01d0b13d601570d113eaa30fafba1b0e235511f | |
parent | 39f565ae8c5646934a8da1e39a75f639cec39dca (diff) | |
parent | 5120aa588c4633383b3a80597895140e51cc59f9 (diff) | |
download | android-f2af34555789e7ae24f7b15df28e802fcf7bc082.tar.gz |
RuntimePermissionsWear: Updates Wear apps for migration to new devrel repo. am: cc3b50a884
am: 5120aa588c
Change-Id: Ie561660388fdf497aef58463fddaebae3f2ee7d5
13 files changed, 58 insertions, 37 deletions
diff --git a/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml b/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml index d8a6a280..b8edf301 100644 --- a/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml +++ b/wearable/wear/RuntimePermissionsWear/Application/src/main/AndroidManifest.xml @@ -20,10 +20,6 @@ android:versionCode="1" android:versionName="1.0"> - <uses-sdk - android:minSdkVersion="18" - android:targetSdkVersion="23" /> - <!-- Permissions for phone. --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> diff --git a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestPhoneService.java b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestPhoneService.java index 2c036cdc..023665e6 100644 --- a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestPhoneService.java +++ b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestPhoneService.java @@ -20,11 +20,11 @@ import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Environment; -import android.support.v4.app.ActivityCompat; import android.util.Log; -import com.example.android.wearable.runtimepermissions.common.Constants; +import androidx.core.app.ActivityCompat; +import com.example.android.wearable.runtimepermissions.common.Constants; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.android.gms.wearable.DataMap; diff --git a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/MainPhoneActivity.java b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/MainPhoneActivity.java index d2c3ea1d..c915d487 100644 --- a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/MainPhoneActivity.java +++ b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/MainPhoneActivity.java @@ -20,18 +20,18 @@ import android.Manifest; import android.app.Activity; import android.content.Intent; import android.content.pm.PackageManager; +import android.os.Bundle; import android.os.Environment; import android.os.Looper; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; -import com.example.android.wearable.runtimepermissions.common.Constants; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; +import com.example.android.wearable.runtimepermissions.common.Constants; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.android.gms.wearable.CapabilityClient; diff --git a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/PhonePermissionRequestActivity.java b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/PhonePermissionRequestActivity.java index 0b10e35d..f27b3a9d 100644 --- a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/PhonePermissionRequestActivity.java +++ b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/PhonePermissionRequestActivity.java @@ -20,12 +20,13 @@ import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; + /** * This is a simple splash screen (activity) for giving more details on why the user should approve * phone permissions for storage. If they choose to move forward, the permission screen diff --git a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/WearPermissionRequestActivity.java b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/WearPermissionRequestActivity.java index 3340ef6b..0a63e9e3 100644 --- a/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/WearPermissionRequestActivity.java +++ b/wearable/wear/RuntimePermissionsWear/Application/src/main/java/com/example/android/wearable/runtimepermissions/WearPermissionRequestActivity.java @@ -18,11 +18,12 @@ package com.example.android.wearable.runtimepermissions; import android.app.Activity; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; + /** * This is a simple splash screen (activity) for giving more details on why the user should approve * phone permissions for storage. If they choose to move forward, the permission screen diff --git a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle b/wearable/wear/RuntimePermissionsWear/Shared/build.gradle index c8b37823..d11e0101 100644 --- a/wearable/wear/RuntimePermissionsWear/Shared/build.gradle +++ b/wearable/wear/RuntimePermissionsWear/Shared/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.2' } } diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml index 385d3ce1..e56ec850 100644 --- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml +++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/AndroidManifest.xml @@ -20,10 +20,6 @@ <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.BODY_SENSORS" /> - <uses-sdk - android:minSdkVersion="21" - android:targetSdkVersion="23" /> - <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestWearService.java b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestWearService.java index 408b4702..6c4c82e2 100644 --- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestWearService.java +++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/IncomingRequestWearService.java @@ -21,11 +21,11 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.hardware.Sensor; import android.hardware.SensorManager; -import android.support.v4.app.ActivityCompat; import android.util.Log; -import com.example.android.wearable.runtimepermissions.common.Constants; +import androidx.core.app.ActivityCompat; +import com.example.android.wearable.runtimepermissions.common.Constants; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.android.gms.wearable.CapabilityClient; diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java index 685f200d..1f26f032 100644 --- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java +++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/java/com/example/android/wearable/runtimepermissions/MainWearActivity.java @@ -23,16 +23,16 @@ import android.hardware.Sensor; import android.hardware.SensorManager; import android.os.Bundle; import android.os.Looper; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.FragmentActivity; -import android.support.wear.ambient.AmbientModeSupport; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; -import com.example.android.wearable.runtimepermissions.common.Constants; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.FragmentActivity; +import androidx.wear.ambient.AmbientModeSupport; +import com.example.android.wearable.runtimepermissions.common.Constants; import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.android.gms.wearable.CapabilityClient; diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_main.xml b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_main.xml index b0e90347..f6c4af77 100644 --- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_main.xml +++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_main.xml @@ -12,7 +12,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" xmlns:tools="http://schemas.android.com/tools" @@ -62,4 +62,4 @@ android:text="@string/hello_wear_activity_main" /> </LinearLayout> -</android.support.wear.widget.BoxInsetLayout> +</androidx.wear.widget.BoxInsetLayout> diff --git a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_request_permission_on_phone.xml b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_request_permission_on_phone.xml index f96d80bf..7df1bb64 100644 --- a/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_request_permission_on_phone.xml +++ b/wearable/wear/RuntimePermissionsWear/Wearable/src/main/res/layout/activity_request_permission_on_phone.xml @@ -12,7 +12,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" xmlns:tools="http://schemas.android.com/tools" @@ -40,7 +40,7 @@ android:paddingRight="6dp" android:textColor="#000000"/> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_width="18dp" android:layout_height="18dp"/> @@ -57,7 +57,7 @@ app:circle_color="#0086D4" android:src="@drawable/ic_cc_open_on_phone"/> - <android.support.v4.widget.Space + <androidx.legacy.widget.Space android:layout_width="8dp" android:layout_height="8dp"/> @@ -71,4 +71,4 @@ android:textColor="#0086D4"/> </LinearLayout> </LinearLayout> -</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/RuntimePermissionsWear/gradle.properties b/wearable/wear/RuntimePermissionsWear/gradle.properties new file mode 100644 index 00000000..94f84728 --- /dev/null +++ b/wearable/wear/RuntimePermissionsWear/gradle.properties @@ -0,0 +1,22 @@ + +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Settings specified in this file will override any Gradle settings +# configured through the IDE. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# 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 + +android.useAndroidX=true +android.enableJetifier=true diff --git a/wearable/wear/RuntimePermissionsWear/template-params.xml b/wearable/wear/RuntimePermissionsWear/template-params.xml index 420265f4..0ea4c628 100644 --- a/wearable/wear/RuntimePermissionsWear/template-params.xml +++ b/wearable/wear/RuntimePermissionsWear/template-params.xml @@ -21,20 +21,25 @@ <package>com.example.android.wearable.runtimepermissions</package> <minSdk>18</minSdk> - <targetSdkVersion>27</targetSdkVersion> + <targetSdkVersion>28</targetSdkVersion> <minSdkVersionWear>23</minSdkVersionWear> - <targetSdkVersionWear>26</targetSdkVersionWear> + <targetSdkVersionWear>28</targetSdkVersionWear> <multiDexEnabled>true</multiDexEnabled> <wearable> <has_handheld_app>true</has_handheld_app> </wearable> - <dependency>com.android.support:appcompat-v7:27.1.1</dependency> - <dependency>com.android.support:design:27.1.1</dependency> + <androidX>true</androidX> + + <dependency>androidx.appcompat:appcompat:1.0.2</dependency> + <dependency>com.google.android.material:material:1.0.0</dependency> + <dependency>androidx.legacy:legacy-support-v13:1.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.android.support:wear:27.1.1</dependency_wearable> <strings> <intro> |