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

15296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
35828e85bb am db9b560e: am d74a44da: 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- 
* commit 'db9b560e19ec4faee00523b350ee54e798da14df':
  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 21:40:50 +00:00
Joe Fernandez
e054c2b35f am 705a1bb4: am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev 
* commit '705a1bb476b9f46a75ae8a90b718f875942364e8':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
 2014-10-22 21:40:49 +00:00
Joe Fernandez
db9b560e19 am d74a44da: 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 'd74a44da81602b1f36123a37d3b721288afde384':
  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 21:34:28 +00:00
Joe Fernandez
705a1bb476 am d42d6553: am c789ef84: Merge "sdk.atree: Move JobScheduler sample from \'ui/views\' to \'background\'" into lmp-dev 
* commit 'd42d655323dadec6c846169ea99f4e06ba123495':
  sdk.atree: Move JobScheduler sample from 'ui/views' to 'background'
 2014-10-22 21:34:26 +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
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
Yigit Boyar
c30782edb2 am bbc4455b: Merge "Add color picker to cardview demo" into lmp-mr1-dev 
* commit 'bbc4455be0a57658475828c452ee8eda29aa8b51':
  Add color picker to cardview demo
 2014-10-22 15:21:43 +00:00
Yigit Boyar
bbc4455be0 Merge "Add color picker to cardview demo" into lmp-mr1-dev 2014-10-22 15:16:40 +00:00
Xavier Ducrohet
12bc49de33 am af87a11e: am 56be755b: am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev 
* commit 'af87a11e4c3fd13bfd8bf7597b2338a8c4d067af':
  Update Build Tools version to <API>.0.2. DO NOT MERGE.
 2014-10-22 14:57:59 +00:00
Xavier Ducrohet
af87a11e4c am 56be755b: am 0a871db0: Merge "Update Build Tools version to <API>.0.2. DO NOT MERGE." into lmp-dev 
* commit '56be755b584fe30880dec69d654137549c03b241':
  Update Build Tools version to <API>.0.2. DO NOT MERGE.
 2014-10-22 14:53:14 +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
46d5f2f08a am c29dc0d2: am 86f364c8: am 3b0ab876: Merge "Modify testrunner/test_defs.xml to delete obsolete cts tests" into lmp-dev 
* commit 'c29dc0d2609830eb7ea59741c1d63cad4345227f':
  Modify testrunner/test_defs.xml to delete obsolete cts tests
 2014-10-20 20:16:39 +00:00
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
80eb5b301b am 804aad73: (-s ours) am 6ca01465: (-s ours) am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '804aad7383e8ee592048e1bb227ef483b1ba70c7':
  Import translations. DO NOT MERGE
 2014-10-20 00:35:22 +00: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
3afda098e1 am bb11b4a9: (-s ours) am 568808dd: (-s ours) am 0a77b1e9: (-s ours) Import translations. DO NOT MERGE 
* commit 'bb11b4a90a394a7c67fec2a687ab248b5bcc518b':
  Import translations. DO NOT MERGE
 2014-10-19 17:06:49 +00: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