Commit Graph

386 Commits

Author SHA1 Message Date
Xavier Ducrohet
8641d4dada Move mulit-dex files around.
This allows the mainDexClasses to work by
finding shrinkedAndroid.jar and proguard (from
the SDK Tools folder) correctly.

Change-Id: Ib3d85f775876b8a487af04bd072f6d8877f31d3b
2014-10-31 13:47:47 -07:00
Xavier Ducrohet
8361bb0dfa Update build-tools and support for multidex.
Add the script to run multi-dex manually in build tools
Update non-maven support package to .0.1 to release a version
with the fixed multi-dex support lib.

Change-Id: I78c84e0d999855f9fc20fadfa21647e570a9f8c9
2014-10-29 11:07:40 -07:00
Xavier Ducrohet
86d28ad8c1 Add jack/jill/multidex lib to build-tools.
Change-Id: Id8aad3a7ea808c5b2d1dd5c008f6202aefb7ef3b
2014-10-28 12:06:50 -07:00
Joe Fernandez
de3f94a000 Merge "Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)" into lmp-dev 2014-10-22 20:25:18 +00:00
Takeshi Hagikura
83642406f8 Deletes the wear samples that have been commited in the wrong place.
Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

Change-Id: Icd27de8c7e72ed9508aa1350a0784d627e072154
2014-10-21 20:24:12 -07:00
Trevor Johns
f70fdf3c80 sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
Change-Id: Ibecdf48a2977ce52b198d626947ba71eba1ad2b9
2014-10-17 12:58:03 -07:00
Trevor Johns
36274ac53d Add additional samples for L to sdk.atree
- RecyclerView
- CardView
- LNotifications
- DrawableTinting
- InterpolatorPlayground
- PdfRendererBasic
- FloatingActionButtonBasic
- RevealEffectBasic

Change-Id: Icea2e207311d60ad72c349c3a6a17439526661af
2014-10-17 12:05:30 -07:00
Trevor Johns
66b6f721b7 Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev 2014-10-17 00:22:31 +00:00
Trevor Johns
b21dca0c15 Update sdk.atree and samples_source.prop_template for L SDK release
- Add new samples to sdk.atree
- Bump revision for samples_source.prop_template

Change-Id: I592d2457502dbd2458dec7879c5cea7320743378
2014-10-16 17:20:10 -07:00
Trevor Johns
ca8bc22a50 sdk.atree: Fix typo and remove legacy BluetoothChat sample
- Fixed typo: Renamed "MediaEffect" sample to "MediaEffects"
- Removed legacy BluetoothChat sample, since the templatized version
  has now been checked in.

Change-Id: I1b5e48f41a3daa171d70bac765cfba2ece9dd088
2014-10-16 00:03:51 -07:00
Trevor Johns
d991bed6f1 Resolved conflicts for merge of '9875ec66' into lmp-dev
Conflicts:
	build/sdk.atree

Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505
2014-10-15 21:16:16 -07:00
Naoki Ishihara
a9b5dd3bb3 Add samples to sdk.atree
Change-Id: I34ee63184f2dea6db253bf2ae2b671abb9ab6c4a
2014-09-19 22:17:08 -07:00
Ying Wang
06a0ec0b97 new installation path of apks.
To fix the SDK build.

Change-Id: I6c401e791bd59367bbd058f323db0d94bf623db5
2014-07-21 16:05:30 -07:00
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