Commit Graph

373 Commits

Author SHA1 Message Date
Griff Hazen
6c3cef6e70 am b3ae9165: am 96f19c45: Sample showing how to embed a wearable app into a phone
* commit 'b3ae91650a49da7453a95ab8c72461d4897c5ccb':
  Sample showing how to embed a wearable app into a phone
2014-06-24 21:04:48 +00:00
Dan Aminzade
59167edab0 am 2c603516: am 9fd71d61: Add new SynchronizedNotifications sample.
* commit '2c6035162e1509651871c5d88ff87c434ba6c56e':
  Add new SynchronizedNotifications sample.
2014-06-24 21:04:47 +00:00
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
Xavier Ducrohet
d732021a67 am 3b024f09: Fix packaging of cardview for non-maven extra package.
* commit '3b024f09a4e7c1bb8a386894de6073e720fed257':
  Fix packaging of cardview for non-maven extra package.
2014-06-23 19:46:07 +00:00
Xavier Ducrohet
3b024f09a4 Fix packaging of cardview for non-maven extra package.
bug: 15770129
Change-Id: I26318b11bf0862c0796729740403c3d729e87ef6
2014-06-23 11:00:37 -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
Xavier Ducrohet
ac21950368 Add more tools to platform-tools
- etc1tool
- hprof-conv
- dmtracedump

These are platform tools rather than SDK Tools.

Change-Id: I75eb8ea5404ef7ecf7104ecc9129cf439df0e51c
2014-06-21 14:56:38 -07:00
Mark Renouf
c788c7955d am 73d0a375: am 2cba0745: Adds a GridViewPager sample wearable app
* commit '73d0a3759a97d0c242a0448957d344de9c412c47':
  Adds a GridViewPager sample wearable app
2014-06-23 03:55:06 +00:00
Griff Hazen
106d4ca41d am 5da8165a: am 9872c0c7: Move all wearable samples to development/samples/wearable
* commit '5da8165a4600c62df835e9f59fc61e2d35c7eae4':
  Move all wearable samples to development/samples/wearable
2014-06-22 09:52:31 +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
Xavier Ducrohet
620a756fcc am ac219503: Add more tools to platform-tools
* commit 'ac21950368a56dbf1a378211e106d7c54056e4cc':
  Add more tools to platform-tools
2014-06-21 22:29:31 +00:00
Griff Hazen
1ad24024b3 am e46688e3: am 2def7d2a: Add first wearable sample to sdk atree
* commit 'e46688e36ed645036d7283be54a9e7a5da311995':
  Add first wearable sample to sdk atree
2014-06-21 20:19:13 +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
Griff Hazen
2def7d2a2a Add first wearable sample to sdk atree
Bug: 15591212

Change-Id: Ic74e8e821d7941d403dc4d83aa33f23cf671c226
2014-06-20 16:04:46 -07:00
Trevor Johns
4a71ff571d am ee811814: Update sdk.atree with new samples for LMP Preview release
* commit 'ee8118144402226bb3fda9c78a27de43140e92ad':
  Update sdk.atree with new samples for LMP Preview release
2014-06-20 19:14:22 +00:00
Trevor Johns
ee81181444 Update sdk.atree with new samples for LMP Preview release
Change-Id: I6bbafb05b39ee448bbe8f831bbbb58e364851c79
2014-06-19 23:57:19 -07:00
Xavier Ducrohet
e263f439b6 am 0f0b786b: Move sqlite3 to platform-tools.
* commit '0f0b786b5af31a7794eacc66eedb252d72490d86':
  Move sqlite3 to platform-tools.
2014-06-18 03:33:24 +00:00
Xavier Ducrohet
0f0b786b5a Move sqlite3 to platform-tools.
This was in the SDK tools before but it's really part of
the platform.

Change-Id: I2a88d288aec6fd1556a28db58976fc1c889efd35
2014-06-17 20:25:57 -07:00
Xavier Ducrohet
c5e962866b am 9a258bce: Revert "Revert "Add cardview to support extra package.""
* commit '9a258bce2cc829e3e80acc4680d7c7fb361f1435':
  Revert "Revert "Add cardview to support extra package.""
2014-06-18 00:42:39 +00: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
de91aa6a87 am fffa1541: Revert "Add cardview to support extra package."
* commit 'fffa1541f10acef428b9b370b4b78b55c72fa306':
  Revert "Add cardview to support extra package."
2014-06-17 23:15:15 +00:00
Xavier Ducrohet
9a258bce2c Revert "Revert "Add cardview to support extra package.""
Also add cardview to the list of support lib in
build/Android.mk

This reverts commit fffa1541f1.

Change-Id: I25bf7ce9d42894933f3cbdf2cc8ae2369945b35b
2014-06-17 16:14:47 -07:00
Xavier Ducrohet
fffa1541f1 Revert "Add cardview to support extra package."
This reverts commit 1e396a5975.
2014-06-17 16:09:48 -07:00
Xavier Ducrohet
af91cc72df am 1e396a59: Add cardview to support extra package.
* commit '1e396a59756dd9900d1cacb14c1cd07ac4901453':
  Add cardview to support extra package.
2014-06-17 19:21:50 +00:00
Xavier Ducrohet
1e396a5975 Add cardview to support extra package.
Change-Id: I796857c19ff466d0d84b9c9901273068510c3fb6
2014-06-17 12:12:16 -07: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
Deepanshu Gupta
9e66bc405f am f7449cdb: Merge "Package renamed fonts again." into lmp-preview-dev
* commit 'f7449cdb18aeef440c8b1e2d7e99ec9970fc7f8a':
  Package renamed fonts again.
2014-06-12 16:54:21 +00:00
Raphael Moll
b6fbb4d0c9 am 9cec99d9: am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint."
* commit '9cec99d9540822e68559e25b471bbe788352839d':
  Generate api-versions.xml for lint.
2014-06-11 18:18:59 +00:00
Xavier Ducrohet
e2172b71fc Remove non-ready support libs. DO NOT MERGE.
Change-Id: I319e9cb26e5ebfaafb3aa209732914f90ddf1446
2014-06-10 17:27:26 -07:00
Deepanshu Gupta
4100ca144d Package renamed fonts again.
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
2014-06-10 18:42:40 -07:00
Chris Banes
e6174a6e97 Merge "DO NOT MERGE Add android-support-v7-palette to build" into lmp-preview-dev 2014-06-11 15:57:38 +00:00
Chris Banes
34d8ff4c6a DO NOT MERGE Add android-support-v7-palette to build
Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
(cherry picked from commit 8028b39252)
2014-06-10 14:00:04 +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
Erik Pasternak
a4a83ccba1 am 0b7a8dbd: Merge "Revert "Package renamed fonts."" into lmp-preview-dev
* commit '0b7a8dbde8b006aef349f75f4837b7f1c9e498fd':
  Revert "Package renamed fonts."
2014-06-09 15:55:46 +00:00
Deepanshu Gupta
177e561e40 am cde7418e: Merge "Package renamed fonts." into lmp-preview-dev
* commit 'cde7418ead103db609dbee8e43b2b91992f3a74a':
  Package renamed fonts.
2014-06-09 15:55:27 +00:00
Erik Pasternak
cdee35f788 Revert "Package renamed fonts."
This change broke the SDK builds.

This reverts commit ef43acc413.

Change-Id: I84af70750f72792cd2e509677c398faefa6e8d91
2014-06-08 19:30:44 +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
32b5e338b5 am 95a5c56c: am 728f321c: Merge "Add Build-Tools runtime.properties file."
* commit '95a5c56c8f6d87bb9a3c4d08b94c13c409c6ea74':
  Add Build-Tools runtime.properties file.
2014-06-04 12:28:41 +00: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
37433ac223 Add Build-Tools runtime.properties file.
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00