LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,555 Commits 2 Branches 0 Tags
4e6ebfdd46ba3124e405bcd88b4b47d888887400
Commit Graph

309 Commits

Author SHA1 Message Date
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
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
Xavier Ducrohet
e2172b71fc Remove non-ready support libs. DO NOT MERGE. 
Change-Id: I319e9cb26e5ebfaafb3aa209732914f90ddf1446
 2014-06-10 17:27:26 -07:00
Raphael Moll
9cec99d954 am ea21b816: am 28748be7: Merge "Generate api-versions.xml for lint." 
* commit 'ea21b8169062fecf0bf32abafc5892ad3beb8238':
  Generate api-versions.xml for lint.
 2014-06-09 23:52:02 +00:00
Raphael Moll
ea21b81690 am 28748be7: Merge "Generate api-versions.xml for lint." 
* commit '28748be7e5a95ca32fd4b930be05ad4bdd365a43':
  Generate api-versions.xml for lint.
 2014-06-09 23:49:42 +00:00
Raphael Moll
4f8a38ed7a Generate api-versions.xml for lint. 
Depends on:
- tools/base      I747d27e998c6dbd61dd17c44bfc747c9542e33d1
- tools/buildSrc  I400f4b6c146836ba30e6e7985ca6c9894985a8cb
- prebuilts/tools Ia4b0c477cf6f4788de610be017a9f5b43d73486c

Change-Id: I3f791d5e1d0ea893cdb5969854d9ae99d5fbb5b7
 2014-06-09 15:59:58 -07:00
Steve Moyer
23a8adf276 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-06-04 09:55:31 -07:00
Raphael Moll
95a5c56c8f am 728f321c: Merge "Add Build-Tools runtime.properties file." 
* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
  Add Build-Tools runtime.properties file.
 2014-06-04 09:55:53 +00:00
Raphael Moll
37433ac223 Add Build-Tools runtime.properties file. 
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
 2014-06-03 13:46:51 -07:00
Raphael Moll
f786331925 am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master 
* commit '261307bebe8986599055bb97d5587977c8da53eb':
  Fix SDK build.
 2014-05-20 23:35:46 +00:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master 
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
 2014-05-20 16:29:29 -07:00
Raphael Moll
e9a7920ca4 Fix SDK build. 
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
 2014-05-20 14:10:47 -07:00
Bill Yi
23f68632c7 Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD 2014-04-29 11:33:09 -07: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
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
Steve Moyer
0b1a1f7b38 Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 2014-04-04 16:32:00 +00:00
Steve Moyer
6ded79d696 DO NOT MERGE: Add SmsTest and mege emulator smoke tests 
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
 2014-04-03 16:02:56 -07:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools. 
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
 2014-04-03 10:09:53 -07: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
61c46959b5 Add the stub src dir to the leanback extras. 
Change-Id: I614bcdd9f9061917fb2c4721cbe1752fd56f6c12
 2014-03-18 13:36:11 -07: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
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
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
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
7f15ddd546 Properly package the RS support bc file. 
Change-Id: Ia55b597085c97cb07029b812392a618a4670ff36
 2014-01-02 16:24:21 -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
Deepanshu Gupta
2c3e0af13c Merge "Add ICU jar to SDK" into jb-mr2-dev 2013-09-05 18:48:10 +00: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
Trevor Johns
af0ab077f3 Remove samples/legacy from sdk.atree 
This directory is only on my local machine, and doesn't
really exist. :)

Change-Id: Iea29b3f06fd089a5dca0f990cca058d9c2e7179b
 2013-07-23 16:03:08 -07:00
Trevor Johns
1ffb35074a Add new sample tree to SDK build 
Old samples will live in samples/${PLATFORM_NAME}/legacy.

New samples are sorted by category, and come from
developers/samples/android.

Change-Id: I573ba4f58d701eac4896ae795d041cae4b9a9794
 2013-07-23 15:54:23 -07:00
Xavier Ducrohet
b7ed7bec1f Add support-v4 to the appcompat lib. 
Change-Id: I2676ca4705e5dca15388e3759ba3a644fbae2b9b
 2013-07-23 12:31:50 -07:00
Siva Velusamy
31cc1650cf Merge "Release systrace into platform-tools" into jb-mr2-dev 2013-07-22 20:53:51 +00:00
Fred Chung
b71371d3af App restriction for restricted profile sample. 
This sample demonstrates how to expose restrictions for a restricted user on a multiuser device.  This feature is available on Android 4.3 (API level 18) and above platforms.

Change-Id: I4ef1bbda8e530dd8370d754de814fce96eaae1f1
 2013-07-21 23:19:18 -07:00