Skip to content
Permalink
Browse files

Auto-update

  • Loading branch information...
google-automerger committed Apr 11, 2019
1 parent e25302e commit 577e05b34ba9b515888433136d4ebad32de647ac
@@ -1,28 +1,28 @@

buildscript {
repositories {
jcenter()
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.3.2'
}
}

apply plugin: 'com.android.application'

repositories {
jcenter()
google()
jcenter()
}

dependencies {
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.google.android.gms:play-services-wearable:15.0.1'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'com.google.android.gms:play-services-wearable:16.0.1'

implementation 'com.android.support:support-v13:27.1.1'

implementation project(':Shared')
wearApp project(':Wearable')
@@ -37,13 +37,13 @@ List<String> dirs = [
'template'] // boilerplate code that is generated by the sample template process

android {
compileSdkVersion 27
compileSdkVersion 28

buildToolsVersion "27.0.3"
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 18
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
}
@@ -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" />

@@ -20,11 +20,11 @@
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;
@@ -20,18 +20,18 @@
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;
@@ -20,12 +20,13 @@
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
@@ -18,11 +18,12 @@

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
@@ -37,8 +37,8 @@ To find out more about wear, visit our [developer Wear page][1].
Pre-requisites
--------------

- Android SDK 27
- Android Build Tools v27.0.3
- Android SDK 28
- Android Build Tools v28.0.3
- Android Support Repository

Screenshots
@@ -67,7 +67,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de
License
-------

Copyright 2017 The Android Open Source Project, Inc.
Copyright 2019 The Android Open Source Project, Inc.

Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE file distributed with this work for
@@ -1,20 +1,20 @@

buildscript {
repositories {
jcenter()
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.3.2'
}
}

apply plugin: 'com.android.library'

repositories {
jcenter()
google()
jcenter()
}


@@ -28,13 +28,13 @@ List<String> dirs = [
'template'] // boilerplate code that is generated by the sample template process

android {
compileSdkVersion 27
compileSdkVersion 28

buildToolsVersion "27.0.3"
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 18
targetSdkVersion 27
targetSdkVersion 28
}

compileOptions {
@@ -1,31 +1,31 @@

buildscript {
repositories {
jcenter()
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.3.2'
}
}

apply plugin: 'com.android.application'

repositories {
jcenter()
google()
jcenter()
}

dependencies {
implementation 'com.android.support:wear:27.1.1'
implementation 'com.google.android.gms:play-services-wearable:15.0.1'
implementation 'androidx.wear:wear:1.0.0'
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
implementation 'com.google.android.gms:play-services-wearable:16.0.1'

implementation 'com.android.support:support-v13:27.1.1'

compileOnly 'com.google.android.wearable:wearable:2.3.0'
compileOnly 'com.google.android.wearable:wearable:2.4.0'

implementation 'com.google.android.support:wearable:2.3.0'
implementation 'com.google.android.support:wearable:2.4.0'

implementation project(':Shared')
}
@@ -40,17 +40,17 @@ List<String> dirs = [

android {

compileSdkVersion 26
compileSdkVersion 28

buildToolsVersion "27.0.3"
buildToolsVersion "28.0.3"

defaultConfig {
versionCode 1
versionName "1.0"

minSdkVersion 23

targetSdkVersion 26
targetSdkVersion 28

multiDexEnabled true

@@ -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"
@@ -21,11 +21,11 @@
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;
@@ -23,16 +23,16 @@
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;
@@ -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>
@@ -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>
</androidx.wear.widget.BoxInsetLayout>
@@ -18,3 +18,5 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

android.useAndroidX=true
android.enableJetifier=true
@@ -1,6 +1,5 @@
#Thu Apr 14 11:01:23 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://services.gradle.org/distributions/gradle-4.10.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 comments on commit 577e05b

Please sign in to comment.
You can’t perform that action at this time.