diff options
| author | Jeremy Walker <jewalker@google.com> | 2016-05-25 00:26:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 00:26:45 +0000 |
| commit | 16a91ffd8847c005105f7a6e6da6a407ebcae162 (patch) | |
| tree | c4ab83029abf3a69a30b90bde7eb0928f570d6f4 | |
| parent | 336c996f49cb2fcef8a18d30f2127e0821bc1ade (diff) | |
| parent | 792c1c9a3e0e01c006c2a096dab5a2d4ae429dd2 (diff) | |
| download | android-16a91ffd8847c005105f7a6e6da6a407ebcae162.tar.gz | |
Fixes redundant dependencies and .gitignore issue.
am: 792c1c9a3e
* commit '792c1c9a3e0e01c006c2a096dab5a2d4ae429dd2':
Fixes redundant dependencies and .gitignore issue.
Change-Id: Id61978ae37e667cbb41fc6d984e0237fb11fb2a9
| -rw-r--r-- | wearable/wear/WatchFace/template-params.xml | 8 | ||||
| -rw-r--r-- | wearable/wear/WearDrawers/.gitignore | 2 | ||||
| -rw-r--r-- | wearable/wear/WearDrawers/template-params.xml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/wearable/wear/WatchFace/template-params.xml b/wearable/wear/WatchFace/template-params.xml index a3d9d8a6..5692e01c 100644 --- a/wearable/wear/WatchFace/template-params.xml +++ b/wearable/wear/WatchFace/template-params.xml @@ -26,13 +26,11 @@ <targetSdkVersion>23</targetSdkVersion> <targetSdkVersionWear>23</targetSdkVersionWear> - <dependency_wearable>com.google.android.gms:play-services-wearable</dependency_wearable> - <dependency_wearable>com.android.support:palette-v7:23.3.0</dependency_wearable> <dependency>com.google.android.support:wearable:1.4.0</dependency> - - <dependency_wearable>com.google.android.support:wearable:2.0.0-alpha1</dependency_wearable> - <dependency>com.google.android.gms:play-services-fitness</dependency> + <dependency_wearable>com.android.support:palette-v7:23.3.0</dependency_wearable> + + <preview_wearable_support_dependency>com.google.android.support:wearable:2.0.0-alpha1</preview_wearable_support_dependency> <dependency_wearable>com.google.android.gms:play-services-fitness</dependency_wearable> <wearable> diff --git a/wearable/wear/WearDrawers/.gitignore b/wearable/wear/WearDrawers/.gitignore index 549831cd..b90e7562 100644 --- a/wearable/wear/WearDrawers/.gitignore +++ b/wearable/wear/WearDrawers/.gitignore @@ -1,4 +1,4 @@ -lt application files +# built application files *.apk *.ap_ diff --git a/wearable/wear/WearDrawers/template-params.xml b/wearable/wear/WearDrawers/template-params.xml index 32bad2e1..41c4f0f2 100644 --- a/wearable/wear/WearDrawers/template-params.xml +++ b/wearable/wear/WearDrawers/template-params.xml @@ -25,7 +25,7 @@ <targetSdkVersionWear>23</targetSdkVersionWear> <provided_dependency_wearable>com.google.android.wearable:wearable:1.0.0</provided_dependency_wearable> - <dependency_wearable>com.google.android.support:wearable:2.0.0-alpha1</dependency_wearable> + <preview_wearable_support_dependency>com.google.android.support:wearable:2.0.0-alpha1</preview_wearable_support_dependency> <strings> <intro> |