diff options
| author | Jeremy Walker <jewalker@google.com> | 2016-05-25 00:32:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 00:32:38 +0000 |
| commit | 9a75eb7e391c1edcf6017e0f5dffea4334e6e97b (patch) | |
| tree | 0225527b73bf04621ab927aca4f59bf8bdef53c5 | |
| parent | 5c6c88c941bfcfeddd4d9353ed4f0794abfafd0f (diff) | |
| parent | 00c77fb92db13fdaee0f7787aa1bcaa0ad50a7b3 (diff) | |
| download | android-9a75eb7e391c1edcf6017e0f5dffea4334e6e97b.tar.gz | |
Fixes redundant dependencies and .gitignore issue. am: 792c1c9a3e am: 16a91ffd88
am: 00c77fb92d
* commit '00c77fb92db13fdaee0f7787aa1bcaa0ad50a7b3':
Fixes redundant dependencies and .gitignore issue.
Change-Id: I1f86d934e00b630c805b69bc9c6d25a1dd861d2c
| -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> |