diff options
author | Jeremy Walker <jewalker@google.com> | 2019-01-10 15:42:15 -0800 |
---|---|---|
committer | Jeremy Walker <jewalker@google.com> | 2019-01-10 15:46:22 -0800 |
commit | e29a30a525c4e05295a60af5b79bdfa4489729de (patch) | |
tree | 66fc878e8d3ffbeffe27b6b3510a2c9c3145ad66 /wearable | |
parent | 65263e1223e96525748f4a26139e40023ff1acd2 (diff) | |
download | android-e29a30a525c4e05295a60af5b79bdfa4489729de.tar.gz |
Update watch face to build correctly.
Bug: 122676168
Bug: 117822353
Test: Manually tested.
Change-Id: Id014265d20149c2cc82e95f0f177dd742dea2415
Diffstat (limited to 'wearable')
5 files changed, 27 insertions, 14 deletions
diff --git a/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml b/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml index 9d06364b..804e17de 100644 --- a/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml +++ b/wearable/wear/WatchFace/Application/src/main/AndroidManifest.xml @@ -17,9 +17,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.wearable.watchface" > - <uses-sdk android:minSdkVersion="18" - android:targetSdkVersion="25" /> - <!-- Permissions required by the wearable app --> <uses-permission android:name="android.permission.WAKE_LOCK" /> diff --git a/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml b/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml index 0c0e0ce0..45dfe190 100644 --- a/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml +++ b/wearable/wear/WatchFace/Wearable/src/main/AndroidManifest.xml @@ -17,10 +17,6 @@ <manifest package="com.example.android.wearable.watchface" xmlns:android="http://schemas.android.com/apk/res/android"> - <uses-sdk - android:minSdkVersion="21" - android:targetSdkVersion="25"/> - <uses-feature android:name="android.hardware.type.watch"/> <!-- Required to act as a custom watch face. --> diff --git a/wearable/wear/WatchFace/gradle.properties b/wearable/wear/WatchFace/gradle.properties new file mode 100644 index 00000000..0bc4294e --- /dev/null +++ b/wearable/wear/WatchFace/gradle.properties @@ -0,0 +1,20 @@ + +# 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 + diff --git a/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties b/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties index 1b2e1114..3aa3818b 100644 --- a/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties +++ b/wearable/wear/WatchFace/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml index fa169b5d..981bd167 100644 --- a/wearable/wear/WatchFace/template-params.xml +++ b/wearable/wear/WatchFace/template-params.xml @@ -23,18 +23,18 @@ <package>com.example.android.wearable.watchface</package> <minSdk>18</minSdk> - <targetSdkVersion>27</targetSdkVersion> + <targetSdkVersion>28</targetSdkVersion> <minSdkVersionWear>24</minSdkVersionWear> - <compileSdkVersionWear>26</compileSdkVersionWear> - <targetSdkVersionWear>26</targetSdkVersionWear> + <compileSdkVersionWear>28</compileSdkVersionWear> + <targetSdkVersionWear>28</targetSdkVersionWear> <multiDexEnabled>true</multiDexEnabled> - <dependency>com.google.android.support:wearable:2.3.0</dependency> - <dependency_wearable>com.android.support:palette-v7:27.1.0</dependency_wearable> - <dependency_wearable>com.android.support:wear:27.1.0</dependency_wearable> + <dependency>com.google.android.support:wearable:2.4.0</dependency> + <dependency_wearable>com.android.support:palette-v7:28.0.0</dependency_wearable> + <dependency_wearable>com.android.support:wear:28.0.0</dependency_wearable> <wearable> |