Trevor Johns
baf6829eec
am f420ff0d: Add browseable samples for Clockwork Beryl
...
* commit 'f420ff0d80e9e44e1744602e832d29563d28312d':
Add browseable samples for Clockwork Beryl
2014-10-23 07:55:07 +00:00
Trevor Johns
f420ff0d80
Add browseable samples for Clockwork Beryl
...
Bug: 17473824
Change-Id: Id4c637733c491ac71bb6e269f55939c082fb0994
2014-10-23 03:36:38 +00:00
Joe Fernandez
f43722b773
am 4a5ce9ae: Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
...
* commit '4a5ce9aedf40ca1de18eafd2e63d31c6d5b63834':
DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
2014-10-22 20:34:42 +00:00
Joe Fernandez
d74a44da81
am de3f94a0: 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
...
* commit 'de3f94a00075fa1c24ac66db2e8c743bd9f46eed':
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 )
2014-10-22 20:29:19 +00:00
Joe Fernandez
d42d655323
am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev
...
* commit 'c789ef844ba501e0d5fc5ae4a429a104541f24ff':
sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
2014-10-22 20:29:17 +00:00
Joe Fernandez
4a5ce9aedf
Merge "DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)" into lmp-dev
2014-10-22 20:28:57 +00:00
Trevor Johns
08e81c8099
DO NOT MERGE: Package samples for Clockwork Beryl (API 21, Samples Rev 2)
...
Change-Id: Ice64270da1cb79985615623a03a7783a580211ce
2014-10-22 20:28:48 +00: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
Joe Fernandez
c789ef844b
Merge "sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'" into lmp-dev
2014-10-22 20:24:12 +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
Xavier Ducrohet
56be755b58
am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev
...
* commit '0a871db0aaf6891fd82afedfeb7dbb94473cd39c':
Update Build Tools version to <API>.0.2. DO NOT MERGE.
2014-10-21 16:25:11 +00:00
Xavier Ducrohet
0a871db0aa
Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev
2014-10-21 16:21:13 +00:00
Xavier Ducrohet
e07505bf02
Update Build Tools version to <API>.0.2. DO NOT MERGE.
...
This for the release that fixes the aapt crash on windows.
Change-Id: I4a8e7d672cf03a48763794c4d559130659d5833b
2014-10-21 09:18:45 -07:00
Chenjie Luo
86f364c8f4
am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev
...
* commit '3b0ab876fabd488e71c01092810f622508a77d22':
Modify testrunner/test_defs.xml to delete obsolete cts tests
2014-10-20 20:08:42 +00:00
Chenjie Luo
3b0ab876fa
Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev
2014-10-20 20:03:14 +00:00
Chenjie Luo
48ef4ff408
Modify testrunner/test_defs.xml to delete obsolete cts tests
...
Bug: 17989468
Change-Id: Ic14603a2b00f35b498ecac3fa4a4f309d29f3408
2014-10-20 12:13:16 -07:00
Baligh Uddin
6ca01465a7
am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '3a39d4e245e39dc0cfad953ef38a11035e69a6c9':
Import translations. DO NOT MERGE
2014-10-20 00:24:57 +00:00
Baligh Uddin
3a39d4e245
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-20 00:16:42 +00:00
Baligh Uddin
c6fcd869c6
Import translations. DO NOT MERGE
...
Change-Id: I1114bea9e5f859734d8058b7344b9122c8dad7a7
Auto-generated-cl: translation import
2014-10-19 16:01:45 -07:00
Baligh Uddin
568808dd39
am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE
...
* commit '0a77b1e924a62097723f4ebe862fa4274c9fa7fe':
Import translations. DO NOT MERGE
2014-10-19 16:56:39 +00:00
Baligh Uddin
0a77b1e924
Import translations. DO NOT MERGE
...
Change-Id: Id9d8758cb68860dad84005bd5a29649b287652ea
Auto-generated-cl: translation import
2014-10-19 09:47:23 -07:00
Xavier Ducrohet
946bfb51c0
Update Build Tools version to <API>.0.1. DO NOT MERGE.
...
This for the release that fixes the aapt crash on windows.
Change-Id: I983a5f084d6786bd0a8c0676b64001d7be6aa3d3
2014-10-17 15:48:37 -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
6876a9cfc5
Add browseable samples for L SDK release
...
Change-Id: I71c6ff9a90b7734042d68af7f01e6d61118cc508
2014-10-17 03:31:00 -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
Trevor Johns
9875ec66e1
am fb67b1ed: Merge "Add samples to sdk.atree" into klp-modular-docs
...
* commit 'fb67b1ed063744889a74e0ff15655affa0bc5c04':
Add samples to sdk.atree
2014-10-16 00:29:32 +00:00
Trevor Johns
fb67b1ed06
Merge "Add samples to sdk.atree" into klp-modular-docs
2014-10-16 00:24:55 +00:00
Trevor Johns
569e9febc5
am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev
...
* commit '679920d8091c0fb10e68667f158b9e18a77689fa':
Update sdk_repo samples 20 from 1 to 2
2014-10-09 01:24:03 +00:00
Trevor Johns
679920d809
Merge commit '3992ec56' into klp-modular-dev
...
Merged with '-s ours', since the DO NOT MERGE directive from
3992ec56 wasn't properly recognized.
Change-Id: If5abab964ab49a6ce02e8da1ff67d2ee12d1b7de
2014-10-08 17:41:47 -07:00
Chenjie Luo
88fbf1fe73
Update test runner for cts tests in testrunner/test_defs.xml
...
Bug: 17885115
Change-Id: I2f95d9964bf152fb1b609e0c878eea1cb096f76f
2014-10-07 15:39:55 -07:00
Tor Norbye
3b2fe7eb9c
Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev
2014-10-07 01:07:25 +00:00
Deepanshu Gupta
2c34d62a0c
Update LayoutLib API level to 12.
...
Change-Id: I7e392515939728251424d44d5957f95bdf3eb741
2014-10-06 16:39:12 -07:00
Tor Norbye
b6b7487e23
Bug 17782530: Annotations using retention policy source remain in .class
...
Change-Id: I763e99c243d85406162e3b898fe1e5af8c216173
2014-10-06 16:21:36 -07:00
Christopher Ferris
bb0d206088
Merge "Do not call art-on macro by default." into lmp-dev
2014-10-05 19:20:06 +00:00
Tor Norbye
0eac39db90
17782530: Annotations using retention policy source remain in .class
...
Change-Id: Ia62e0d6ef5024515567be6564197e723f0013ee0
2014-10-04 18:49:35 +00:00
Christopher Ferris
436b740b70
Do not call art-on macro by default.
...
If you are debugging a native process, SIGSEGV gets ignored by default.
The gdbclient bash function has been modified to only call the art-on
macro when running gdbclient app_processXX.
Also, print a warning in case someone is trying to debug a native
process using app_process.
Bug: 17815162
Change-Id: I0666e6713b0a03ee713be7827c5b671938f2c263
2014-10-03 17:31:41 -07:00
Xavier Ducrohet
3c0cd8cf15
Merge "Package libc++.so in the build-tools." into lmp-dev
2014-10-03 19:37:24 +00:00
Trevor Johns
3992ec5675
Update sdk_repo samples 20 from 1 to 2
...
DO NOT MERGE
Change-Id: Ia9d89a28991fc1ac4d81e18fe596bc793e54353c
2014-10-02 18:36:43 -07:00
Ruben Brunk
e5aa0f3fa8
runtest: Remove unused CtsTestStubs dependency.
...
Change-Id: Icee3004731ab5d37e8eb2caba76b19b0a5f1b1b7
2014-10-02 13:08:24 -07:00
Yigit Boyar
52af255018
Don't layout removed scrap views
...
This CL also changes the addView logic in demo LM. Previously, removed
views were not added. Now, RV takes care of this so LM can simply add them.
Bug: 17783492
Change-Id: I375405ef888fd43f9da0e1a1c13ae54bae381b44
2014-10-02 17:43:03 +00:00
Xavier Ducrohet
25feba6980
Package libc++.so in the build-tools.
...
This is needed by llvm-rs-cc.
Bug: 17584627
Change-Id: Id0ee90ccead26d3078f3f25022391d6866152203
2014-10-01 22:12:58 -07:00
Stephen Hines
3f2caae206
Restore the ability to build RS-related binaries on Windows.
...
Bug: 14416410
This change reverts two prior commits (listed below):
Revert "Use renderscript prebuilts for windows."
This reverts commit ebacf02e88 .
Revert "Temporarily disable rs/bcc in win_sdk"
This reverts commit c63c2d31ba .
2014-09-30 02:35:08 -07:00
Dake Gu
221b154a72
SupportLeanbackDemo: Fix crash of launch Detail from Search
...
Now DetailsFragment is expecting PhotoItem, SearchFragment should not pass
a String to DetailsFragment.
Change-Id: I7794c6a14dcaa1de1d1177f3288bb7460a45bf7d
2014-09-27 01:32:10 +00:00
Xavier Ducrohet
91909fae54
Prepare the SDK component version numbers.
...
Change-Id: I2577ec690533e6b45a95b38c6cc0f82cb0981c5b
2014-09-22 18:55:19 -07:00
Naoki Ishihara
a9b5dd3bb3
Add samples to sdk.atree
...
Change-Id: I34ee63184f2dea6db253bf2ae2b671abb9ab6c4a
2014-09-19 22:17:08 -07:00
Dake Gu
7c4d38c43e
SupportLeanbackDemo: dont override fragment's object from activity
...
Activity should only initialize fragment's object when it is first created.
Then the object's lifecycle is controled by fragment.
b/17547817
Change-Id: I169111d2936aadfa9386b288e6922c563b4b5277
2014-09-17 17:14:33 +00:00