LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,328 Commits 2 Branches 0 Tags
e67c313ea0781650b7a31308dbe2cc5919425a3e
Commit Graph

15328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chenjie Luo
c29dc0d260 am 86f364c8: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit '86f364c8f438b06340bd6a42cf8340d24b5dc813':
  Modify testrunner/test_defs.xml to delete obsolete cts tests
 2014-10-20 20:12:44 +00: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
804aad7383 am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '6ca01465a7b2a0b293756243388cff2a1bb0a5bb':
  Import translations. DO NOT MERGE
 2014-10-20 00:30:13 +00: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
bb11b4a90a am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit '568808dd397b8951ad5b525b5ad7f4471f47c4eb':
  Import translations. DO NOT MERGE
 2014-10-19 17:01:27 +00: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
297089b18e am 946bfb51: Update Build Tools version to <API>.0.1. DO NOT MERGE. 
* commit '946bfb51c0c4e47c9d111ada1fddf050e2823609':
  Update Build Tools version to <API>.0.1. DO NOT MERGE.
 2014-10-17 23:01:45 +00: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
c60b2dd6b5 am 36274ac5: Add additional samples for L to sdk.atree 
* commit '36274ac53dfcef9661c5215e9fabf7a6501e0c64':
  Add additional samples for L to sdk.atree
 2014-10-17 19:56:44 +00: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
4b5d8355cb am 6876a9cf: Add browseable samples for L SDK release 
* commit '6876a9cfc5eb05168ae7fa5215979f22396fff58':
  Add browseable samples for L SDK release
 2014-10-17 18:53:07 +00:00
Trevor Johns
4e09738a86 am 66b6f721: Merge "Update sdk.atree and samples_source.prop_template for L SDK release" into lmp-dev 
* commit '66b6f721b7e20911f0764720346caca5c77fb22b':
  Update sdk.atree and samples_source.prop_template for L SDK release
 2014-10-17 18:50:56 +00:00
Trevor Johns
72687bd8a7 am ca8bc22a: sdk.atree: Fix typo and remove legacy BluetoothChat sample 
* commit 'ca8bc22a50c47517e7731a1762ffe39e105462b5':
  sdk.atree: Fix typo and remove legacy BluetoothChat sample
 2014-10-17 18:50:55 +00: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
70c55867bc am d991bed6: Resolved conflicts for merge of \'9875ec66\' into lmp-dev 
* commit 'd991bed6f11b830616a967fde54f8d4f1e86eef0':
  Add samples to sdk.atree
 2014-10-16 19:00:19 +00: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
Tadashi G. Takaoka
97f11e1c34 (DO NOT MERGE) Fix sample SoftKeyboard preference activity 
(cherry picked from Master, commit 8359ac20a5)

Bug: 17887760
Change-Id: Ibe7d1f2b9189ecee7867a2448790eddb151bd61a
 2014-10-15 09:19:12 +00:00
Yigit Boyar
e70d01bbf5 Add color picker to cardview demo 
Bug: 17668891
Change-Id: Id54bae8e37ffb4d1f077ca4ef9a721766277c02e
 2014-10-14 12:31:08 -07:00
Trevor Johns
913f814641 am 569e9feb: am 679920d8: Merge commit \'3992ec56\' into klp-modular-dev 
* commit '569e9febc5c91d92459579e32df7b948d3e32dff':
  Update sdk_repo samples 20 from 1 to 2
 2014-10-09 19:23:24 +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
9ac2afe4ce am 88fbf1fe: Update test runner for cts tests in testrunner/test_defs.xml 
* commit '88fbf1fe733a5332f1a2ba44253b46a20fed1e6f':
  Update test runner for cts tests in testrunner/test_defs.xml
 2014-10-08 05:24:56 +00: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
3f75a9a034 am 3b2fe7eb: Merge "Bug 17782530: Annotations using retention policy source remain in .class" into lmp-dev 
* commit '3b2fe7eb9cab88d3957794cb0f14ddc10a57dc29':
  Bug 17782530: Annotations using retention policy source remain in .class
 2014-10-07 01:22:17 +00: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
e5a9f9d066 am 2c34d62a: Update LayoutLib API level to 12. 
* commit '2c34d62a0c53c45f10bb834fb9e0b910c63b7fd4':
  Update LayoutLib API level to 12.
 2014-10-07 00:20:33 +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
9329e4f0ad am bb0d2060: Merge "Do not call art-on macro by default." into lmp-dev 
* commit 'bb0d2060884d131bdb0321c06ff49b04ba2196b4':
  Do not call art-on macro by default.
 2014-10-05 19:27:09 +00: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
7fb913fe2c am 0eac39db: 17782530: Annotations using retention policy source remain in .class 
* commit '0eac39db9053bd3f417d113553d81e36acbbffcc':
  17782530: Annotations using retention policy source remain in .class
 2014-10-04 20:45:18 +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
21af667fae am 3c0cd8cf: Merge "Package libc++.so in the build-tools." into lmp-dev 
* commit '3c0cd8cf154320a375f971ba1ce3be4497130837':
  Package libc++.so in the build-tools.
 2014-10-03 21:32:35 +00:00
Xavier Ducrohet
3c0cd8cf15 Merge "Package libc++.so in the build-tools." into lmp-dev 2014-10-03 19:37:24 +00:00
Chris Banes
cb838606af Merge "Update Support7Demos for L appcompat" into lmp-mr1-dev 2014-10-03 08:37:00 +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