Commit Graph

632 Commits

Author SHA1 Message Date
Griff Hazen
b3ae91650a am 96f19c45: Sample showing how to embed a wearable app into a phone
* commit '96f19c456f3eafea5ab267b13dfceae1c75964eb':
  Sample showing how to embed a wearable app into a phone
2014-06-24 21:00:20 +00:00
Dan Aminzade
2c6035162e am 9fd71d61: Add new SynchronizedNotifications sample.
* commit '9fd71d61f262bfe238b58c60fab6e6494b028356':
  Add new SynchronizedNotifications sample.
2014-06-24 21:00:19 +00:00
Griff Hazen
96f19c456f Sample showing how to embed a wearable app into a phone
With a keystore present.

Change-Id: I3693f8c4b7ff09fe2fc3023bfe561b929333b8a4
2014-06-23 15:36:51 -07:00
Dan Aminzade
9fd71d61f2 Add new SynchronizedNotifications sample.
This sample demonstrates how to use DataItems to construct linked
phone- and wearable-side notifications.

Change-Id: I6defa7fad671ba2ec0de25c8913abd66d07846a2
2014-06-23 15:32:56 -07:00
Mark Renouf
73d0a3759a am 2cba0745: Adds a GridViewPager sample wearable app
* commit '2cba0745a46ee260bfbe303fa89386ab5348604c':
  Adds a GridViewPager sample wearable app
2014-06-23 03:53:22 +00:00
Mark Renouf
2cba0745a4 Adds a GridViewPager sample wearable app
Change-Id: I014670493bb54bc1a6e3c1ecda716b9ea8d83412
2014-06-22 21:24:55 -04:00
Griff Hazen
9872c0c7c0 Move all wearable samples to development/samples/wearable
Update build.gradle to compile them all, and remove
gradle stopships.

Copied from vendor/google_clockwork klp-modular-dev as of:
01930cc85bc1ba974a412db7d3c9d17387702e16

Bug: 15591212
Bug: 15264403

Change-Id: I4d05c35c995e675d92039b1dfb2a33e454285af5
2014-06-22 00:18:09 -07:00
Griff Hazen
2def7d2a2a Add first wearable sample to sdk atree
Bug: 15591212

Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
2014-06-20 16:04:46 -07:00
Raphael Moll
3f3f34dc0e Move SDK system-image source.prop_templates in their own folder. DO NOT MERGE.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616

Conflicts:
	build/sdk-android-arm64-v8a.atree
	build/sdk-android-x86.atree
	build/sdk-android-x86_64.atree
	sys-img/images_arm64-v8a_source.prop_template
	sys-img/images_x86_64_source.prop_template
2014-06-20 08:49:37 -07:00
Raphael Moll
71ad7c8f4e Fix SDK repo to prevent mixing different targets. DO NOT MERGE.
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f7)

Change-Id: I8ad6763ace0d6075a743b99fd65a5ae8b69bf3d5
2014-06-20 08:38:23 -07:00
Raphael Moll
efbf1a3e28 SDK: support generating repository XML with latest XSD. DO NOT MERGE.
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
  get their own XML file.

(cherry picked from commit ea40d2f4c5)

Change-Id: Id0363c446014a96a7f78c8e5500fae6092e97dc3
2014-06-20 08:28:25 -07:00
Xavier Ducrohet
f78598f754 Fix repo script to ignore tools. DO NOT MERGE.
(cherry picked from commit d81eb5d833)

Change-Id: I7dbd0db25b84a11c36fcd570935357b0e755555c
2014-06-20 08:24:05 -07:00
Ji-Hwan Lee
5ece703b19 Merge "Fix sdk build, really this time" into klp-modular-dev-plus-aosp 2014-06-19 22:55:19 +00:00
Griff Hazen
5da8165a46 am 9872c0c7: Move all wearable samples to development/samples/wearable
* commit '9872c0c7c0383c0d940bab2862c9468af26ee638':
  Move all wearable samples to development/samples/wearable
2014-06-22 09:02:21 +00:00
Griff Hazen
e46688e36e am 2def7d2a: Add first wearable sample to sdk atree
* commit '2def7d2a2a0e9eacf49819c9cba3e5b188b061c3':
  Add first wearable sample to sdk atree
2014-06-21 20:15:49 +00:00
Ji-Hwan Lee
e3e3de0cef Fix sdk build, really this time
Change-Id: I5cddf63a6dc30dee5185a3a6a4e352c574a87213
2014-06-22 04:26:56 +09:00
Ji-Hwan Lee
5cd3de1cc6 Fix sdk builds
Change-Id: Ifca3f430795bf002ecc7bf77b38c2336e578c5fc
2014-06-21 17:19:49 +09:00
Xavier Ducrohet
b931fca7eb resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp
Change-Id: I8657c95b169320957629b492fef11994227b3c56
2014-06-20 17:51:14 -07:00
Deepanshu Gupta
40c2c69bd8 resolved conflicts for merge of c91c719f to klp-modular-dev-plus-aosp
Change-Id: I0c942398f6acecf072da1a2148fbc900a609e870
2014-06-17 17:27:29 -07:00
Deepanshu Gupta
c91c719f91 am dd2dac36: am edf631de: Package renamed fonts. [DO NOT MERGE]
* commit 'dd2dac3659cad1594ce3a72f10b1216424b62441':
  Package renamed fonts. [DO NOT MERGE]
2014-06-18 00:15:40 +00:00
Deepanshu Gupta
dd2dac3659 am edf631de: Package renamed fonts. [DO NOT MERGE]
* commit 'edf631dee4edd3c44cd4156ccb7974090c89b65d':
  Package renamed fonts. [DO NOT MERGE]
2014-06-18 00:10:42 +00:00
Xavier Ducrohet
06a5de5e8b am 6c9d1af8: Merge "Remove non-ready support libs. DO NOT MERGE." into klp-modular-dev
* commit '6c9d1af8213394eb9458e71f2e6d62c4de716902':
  Remove non-ready support libs. DO NOT MERGE.
2014-06-17 01:27:24 +00:00
Deepanshu Gupta
edf631dee4 Package renamed fonts. [DO NOT MERGE]
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.

Change-Id: I023fb0dfcf50698f80e26b7d476969c453fc4cc7
(cherry picked from commit 4100ca144d)
2014-06-12 15:27:57 -07:00
Xavier Ducrohet
e2172b71fc Remove non-ready support libs. DO NOT MERGE.
Change-Id: I319e9cb26e5ebfaafb3aa209732914f90ddf1446
2014-06-10 17:27:26 -07:00
Raphael Moll
bbd9b96cd1 am 8235126e: am 9649c415: Merge "Change api-versions.xml generator source order."
* commit '8235126ebf42ddd9dd1e9d8191be67ae46cb54ae':
  Change api-versions.xml generator source order.
2014-06-10 21:12:13 +00:00
Raphael Moll
8235126ebf am 9649c415: Merge "Change api-versions.xml generator source order."
* commit '9649c415e7e959b67a8810cd17ab65b7994c0f71':
  Change api-versions.xml generator source order.
2014-06-10 21:08:36 +00:00
Raphael Moll
7d86138caa Change api-versions.xml generator source order.
The generator now takes files first from prebuilts/tools
and then if not found takes them from prebuilds/sdk.

Change-Id: Ia099c26202292537e92eaaaa5c26ad2916114f1e
2014-06-10 11:10:57 -07:00
Ying Wang
c8ed8c25bc am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
* commit 'bcfa67e56dd7862d085954d2c4b349f8199c3d28':
  Switch to SDK_HOST_ARCH
2014-06-10 16:30:41 +00:00
Ying Wang
bcfa67e56d am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"
* commit '1e1b10acd152ae67670587ef1682ba6a3ed8a66c':
  Switch to SDK_HOST_ARCH
2014-06-10 16:28:00 +00:00
Ying Wang
1e1b10acd1 Merge "Switch to SDK_HOST_ARCH" 2014-06-10 16:26:22 +00:00
Raphael Moll
9cec99d954 am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
  Generate api-versions.xml for lint.
2014-06-09 23:52:02 +00:00
Raphael Moll
ea21b81690 am 28748be7: Merge "Generate api-versions.xml for lint."
* commit '28748be7e5a95ca32fd4b930be05ad4bdd365a43':
  Generate api-versions.xml for lint.
2014-06-09 23:49:42 +00:00
Raphael Moll
4f8a38ed7a Generate api-versions.xml for lint.
Depends on:
- tools/base      I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc  I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c

Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
2014-06-09 15:59:58 -07:00
Ying Wang
e7db94431e Switch to SDK_HOST_ARCH
SDK_HOST_ARCH will be x86 if we are doing 32-bit host multilib build,
in which HOST_ARCH is actually x86_64.

Bug: 13751317
Change-Id: I8b7893b10cc4d0e71076b3b3625ec2f352aa8602
2014-06-09 15:03:04 -07:00
Raphael Moll
adcf12ed08 am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
* commit '4000df931bb1b0f9a9e37430212124a9c37e6972':
  Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:58:54 +00:00
Raphael Moll
4000df931b am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
  Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:46:13 +00:00
Raphael Moll
6ab8ef21b8 Merge "Move SDK system-image source.prop_templates in their own folder." 2014-06-04 21:30:14 +00:00
Steve Moyer
23a8adf276 DO NOT MERGE: Add SmsTest and mege emulator smoke tests
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-06-04 09:55:31 -07:00
Raphael Moll
95a5c56c8f am 728f321c: Merge "Add Build-Tools runtime.properties file."
* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
  Add Build-Tools runtime.properties file.
2014-06-04 09:55:53 +00:00
Raphael Moll
26bcf6a511 Move SDK system-image source.prop_templates in their own folder.
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.

Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
2014-06-03 17:30:16 -07:00
Raphael Moll
37433ac223 Add Build-Tools runtime.properties file.
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00
Raphael Moll
e9555599da am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."
* commit '087ccb01527d9d7e8981751639c65b1eb6369534':
  Fix SDK repo to prevent mixing different targets.
2014-06-03 02:56:09 +00:00
Raphael Moll
087ccb0152 Merge "Fix SDK repo to prevent mixing different targets." 2014-06-03 01:27:03 +00:00
Raphael Moll
4df9f469f7 Fix SDK repo to prevent mixing different targets.
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
2014-06-02 17:11:45 -07:00
Raphael Moll
267ddd50d7 am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '937cfb42602c081143e1854ba5f67e18b2f97b46':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:59:48 +00:00
Raphael Moll
937cfb4260 am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
  Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:57:55 +00:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-27 16:10:14 -07:00
Raphael Moll
f786331925 am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
* commit '261307bebe8986599055bb97d5587977c8da53eb':
  Fix SDK build.
2014-05-20 23:35:46 +00:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
2014-05-20 16:29:29 -07:00
Raphael Moll
e9a7920ca4 Fix SDK build.
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
2014-05-20 14:10:47 -07:00