Commit Graph

314 Commits

Author SHA1 Message Date
Evan Charlton
10163e76fc am 311e3662: Merge "Merging emulator smoke test projects" into master-nova
* commit '311e3662bdaec82c621fd3b04c4505ce60d2df15':
  Merging emulator smoke test projects
2014-05-13 15:19:06 +00:00
Baligh Uddin
31078f7fbd am 3b842a86: keep history after reset to master-nova-dev
* commit '3b842a8628da809286b810b6881e382890ead1f6':
2014-05-13 15:18:49 +00:00
Alexander Lucas
b9581d5aae am 229d4df3: am 5bf3d523: am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree
* commit '229d4df318a4adc0fae28989b8cb0ca277a2f201':
  Added swipe-to-refresh samples to sdk.atree
2014-04-11 23:01:16 +00:00
Alexander Lucas
5bf3d5236c am fd5ede91: am f5d4c15b: Added swipe-to-refresh samples to sdk.atree
* commit 'fd5ede91e7900da3bbc20b9ef0ca3859ec499e01':
  Added swipe-to-refresh samples to sdk.atree
2014-04-11 22:31:42 +00:00
Alexander Lucas
f5d4c15b0b Added swipe-to-refresh samples to sdk.atree
Change-Id: If939f14e90c04d2df8bbe683812d2f01ef5f3399
2014-04-11 15:20:55 -07:00
Alexander Lucas
b015fd0ff0 am b020e934: am ad5f0e86: am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs
* commit 'b020e934c5584706d7edfa0c0fe24f69f6a6d38b':
  Updated Samples metadata for April push of samples
2014-04-11 20:36:08 +00:00
Alexander Lucas
ad5f0e867b am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs
* commit 'eb72a6002c8ebdeeb94e432dadc828d7d158cbf2':
  Updated Samples metadata for April push of samples
2014-04-11 20:29:54 +00:00
Alexander Lucas
c7ad654960 Updated Samples metadata for April push of samples
Change-Id: Ie4136c1cb9051bead3c73a93ccf646577d721a50
2014-04-11 13:21:11 -07:00
Xavier Ducrohet
f3ff0296c9 Move ZipAlign to build-tools. DO NOT MERGE.
(cherry picked from commit 76510e2dd2)

Change-Id: I2262795c0dfe9b103fda8c9a50a80d688ece5a12
2014-04-04 10:45:35 -07:00
Xavier Ducrohet
8821b239d1 am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools."
* commit 'd6ccbcd253d34feb75cba4cbd98f520dfa789757':
  Move ZipAlign to build-tools.
2014-04-04 03:19:02 +00:00
Xavier Ducrohet
d6ccbcd253 am 47eadf1e: Merge "Move ZipAlign to build-tools."
* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
  Move ZipAlign to build-tools.
2014-04-04 00:08:23 +00:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools.
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
2014-04-03 10:09:53 -07:00
Xavier Ducrohet
6ee68fe343 am 6e211383: am 459fdbce: am dcb2c538: Add annotation support lib to SDK.
* commit '6e21138341dde9036675737cdfa8baa76cb70c5d':
  Add annotation support lib to SDK.
2014-03-26 18:23:16 +00:00
Xavier Ducrohet
459fdbcee8 am dcb2c538: Add annotation support lib to SDK.
* commit 'dcb2c538b88b84ba33dd2dd3a4afaab79a05608a':
  Add annotation support lib to SDK.
2014-03-26 18:10:47 +00:00
Xavier Ducrohet
dcb2c538b8 Add annotation support lib to SDK.
Change-Id: If9faed19abc14fe6af288494c688a80789215a3b
2014-03-26 10:49:13 -07:00
Tim Kilbourn
cdb09c943e am 56c1077d: am c9d6af6b: Merge "Add the stub src dir to the leanback extras." into klp-modular-dev
* commit '56c1077d131cf807563eb7b8e8bc2263f8bb1748':
  Add the stub src dir to the leanback extras.
2014-03-24 19:35:16 +00:00
Tim Kilbourn
61c46959b5 Add the stub src dir to the leanback extras.
Change-Id: I614bcdd9f9061917fb2c4721cbe1752fd56f6c12
2014-03-18 13:36:11 -07:00
Alexander Lucas
ab05cdfb72 am dd7dda23: am 964fa100: am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit 'dd7dda23a56844b706bd20c752b0696571fc582d':
  Added new samples to sdk.atree for march push
2014-03-14 17:54:24 +00:00
Alexander Lucas
964fa100be am 7ae2eca4: am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '7ae2eca4a0762f347e2a1981dc1becbc16a5c4bc':
  Added new samples to sdk.atree for march push
2014-03-14 16:28:32 +00:00
Alexander Lucas
7ae2eca4a0 am 7a80e034: Merge "Added new samples to sdk.atree for march push" into klp-docs
* commit '7a80e034839e02c295cb75c59c6af75e17dad238':
  Added new samples to sdk.atree for march push
2014-03-13 22:15:02 +00:00
Tim Kilbourn
957fa659c2 resolved conflicts for merge of 9eecf3fc to master
Change-Id: If38c80cd560d8b419420fc05a872c31b6031d90a
2014-03-12 17:27:10 -07:00
Tim Kilbourn
349ba52587 Add new support libs into the sdk build.
android-support-v7-recyclerview
android-support-v17-leanback

Change-Id: I6538bb30204aeaeac0b0ea34f0a5951e09f58866
2014-03-12 15:28:23 -07:00
Alexander Lucas
c4a6ecf00d Added new samples to sdk.atree for march push
Change-Id: Ic138c1ff32c86ebb48375cc07d0c138829c8a3f7
2014-03-10 14:49:49 -07:00
Alexander Lucas
97c8590ca8 Updating build metadata for march sample push.
Change-Id: Ic8f6e2adce61c76cfb3e3c6db96f13c915be7a63
2014-03-07 15:00:38 -08:00
Steve Moyer
b99f97d38e Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
2014-03-03 15:28:02 -08:00
Steve Moyer
138d520cf7 Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Change-Id: I7a9b8e787af37704e6af43b93f169ef90980cb2d
2014-02-20 10:26:59 -08:00
Steve Moyer
a775c5a05d Merge "Adding SmsTest to emulator" 2014-02-11 00:42:36 +00:00
Steve Moyer
5db4928a45 Adding SmsTest to emulator
Change-Id: I0820ec25550debab3755db569e0e4fb6a9c62e94
2014-02-10 17:59:29 +00:00
Alexander Lucas
93ca68b5fa am 862cb15a: am 213b633f: am b58b3103: am 47be1a3b: am fc1c6987: Updated sdk.atree to include new samples for feb sample launch
* commit '862cb15a018472241b93310caa0918e77f7513ac':
  Updated sdk.atree to include new samples for feb sample launch
2014-02-10 12:51:40 +00:00
Alexander Lucas
fc1c69874c Updated sdk.atree to include new samples for feb sample launch
Change-Id: I71af239a0bf0f146345e243720d9e4300c5ed1f6
2014-02-06 14:45:32 -08:00
Deepanshu Gupta
819f19e62f am c6b9cf1d: am 25f6b164: am 31936361: am ce8ddf4f: am 0363ab1f: Merge "Bundle Noto fonts with the SDK" into klp-dev
* commit 'c6b9cf1dddff4b3c8a9574cac5efbbcc334300b3':
  Bundle Noto fonts with the SDK
2014-02-06 03:29:49 +00:00
Deepanshu Gupta
0363ab1f74 Merge "Bundle Noto fonts with the SDK" into klp-dev 2014-02-06 02:05:06 +00:00
Deepanshu Gupta
bc0b4a804f Bundle Noto fonts with the SDK
Change-Id: I28c48b3b5dbd761ef0391497e834f315ac83cae4
2014-01-08 01:44:45 +00:00
Xavier Ducrohet
39c7e520bc am 699fdf70: am c7e44de1: am cd171fd3: am 7f15ddd5: Properly package the RS support bc file.
* commit '699fdf70319ed2f5842216c0ade4118b9f236f49':
  Properly package the RS support bc file.
2014-01-07 19:07:32 +00:00
Xavier Ducrohet
7f15ddd546 Properly package the RS support bc file.
Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
2014-01-02 16:24:21 -08:00
Alexander Lucas
a4571dc351 am 607b0da6: am f044ac48: am b734f1b5: Updating sdk.atree to reflect new set of samples
* commit '607b0da6372cc033eb52684fbfd425c2298984b2':
  Updating sdk.atree to reflect new set of samples
2013-11-21 14:34:42 -08:00
Alexander Lucas
b734f1b590 Updating sdk.atree to reflect new set of samples
Change-Id: I1308d65f77783fc7f43fdc36bf90a59a137ec73f
2013-11-21 13:32:25 -08:00
Maurice Chu
7b433ee4e4 Move multidex support library
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: Iff895425d4d7b2278641cbe147bd35d0788cadee
2013-11-12 09:37:43 +00:00
Yohann Roussel
6fa1156b3b Add res folder to multidex SDK projects.
This will fix an error when importing thoses projects with ADT.

Change-Id: I75d2b0376222b13d630ef7e53386dedf62cc3fec
2013-09-12 07:51:54 +00:00
Yohann Roussel
6f57b24889 android-support-multidex-instrumentation in SDK.
Change-Id: I6e39034f592f6ad7654ee37970f3367a87b2034f
2013-09-11 08:05:14 +00:00
Deepanshu Gupta
4e21d52071 am a4a7f11e: am 7a63270e: am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev
* commit 'a4a7f11e117dec76d8a67477c99820d8bd83f3a0':
  Add ICU jar to SDK
2013-09-05 12:03:43 -07:00
Deepanshu Gupta
2c3e0af13c Merge "Add ICU jar to SDK" into jb-mr2-dev 2013-09-05 18:48:10 +00:00
Yohann Roussel
a6ca3cf29f Add multidex ADT project to SDK.
Change-Id: I7d622886441589002da55522ec391f19cae79da0
2013-08-22 18:34:41 +02:00
Trevor Johns
6a3067db20 Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev 2013-08-15 22:15:11 +00:00
Xavier Ducrohet
8791785cd0 Package Renderscript files for support mode.
Change-Id: I4eae052b01ae014f3e4d289ba33893dfd9c43309
2013-08-13 15:57:08 -07:00
Stephen Hines
94efbd635d Add bcc_compat to sdk.atree to fix build break.
Change-Id: Iaccd5654aca64b249e9805844099fc4724b6b07e
2013-08-06 18:18:27 -07:00
Xavier Ducrohet
1fda188905 Merge "Add dynamic libraries for renderscript." into jb-mr2-dev 2013-07-25 19:30:53 +00:00
Xavier Ducrohet
afda1d33de Add dynamic libraries for renderscript.
The new llvm-rs-cc compiler is not statically linked
anymore so those libraries are needed.

Also add the new support stuff.

Change-Id: I4d56f0b07f0f0f120b512726689ae4ff07f38322
2013-07-25 12:24:21 -07:00
Trevor Johns
2a4aa3cd5d Remove AppRestrictions and BluetoothLeGatt samples
These have been moved to the new samples repository in
developers/samples/android.

Change-Id: I77312ea146ccb47ec8ecf38c9448149ec4c34962
2013-07-24 12:36:28 -07:00
Trevor Johns
da67d18b5b Add common directory to BasicSyncAdapter sample
This directory will be automatically copied over using a
templating system in the future, but for now it needs to
be copied in using sdk.atree.

This also allows us to remove the symlink that was checked
in previously, and which likely won't work on Windows.

Change-Id: If3d78eec7c1b845d1ae1caca59099d3284bdf73a
2013-07-24 12:31:16 -07:00