LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,648 Commits 2 Branches 0 Tags
7798f331bc32225aa419ead111b22c3f2e5dd52c
Commit Graph

16648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Albert
6313a60dc5 Add aday, which converts build numbers to dates. 
Change-Id: I8d4219f961951ef1d84d3027d361378005764ee6
 2015-01-06 16:11:06 -08:00
Deepanshu Gupta
192f14db57 am 2aa06dbe: am c69ff83f: resolved conflicts for merge of 748fb34d to lmp-mr1-dev 
* commit '2aa06dbe20ebfbd837e7a672efcb441cf736654c':
  Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
 2015-01-06 22:57:04 +00:00
Deepanshu Gupta
2aa06dbe20 am c69ff83f: resolved conflicts for merge of 748fb34d to lmp-mr1-dev 
* commit 'c69ff83feb6f6b0ebc0f4997a84cadc14bdd4488':
  Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
 2015-01-06 22:44:32 +00:00
Deepanshu Gupta
c69ff83feb resolved conflicts for merge of 748fb34d to lmp-mr1-dev 
Change-Id: I729cc4282ff2b65907fd8013de270bca514c6e83
 2015-01-06 14:35:25 -08:00
Andrew Hsieh
4400c6bec9 am f02769d6: am 817e1ef4: Merge "Use define for drm property keys instead of defining as char pointers" 
* commit 'f02769d6ba2b06ee6be80315f39b43679e9e905f':
  Use define for drm property keys instead of defining as char pointers
 2015-01-06 00:08:30 +00:00
Andrew Hsieh
f02769d6ba am 817e1ef4: Merge "Use define for drm property keys instead of defining as char pointers" 
* commit '817e1ef4876a237d71c40dddf0ad75b73ab72b31':
  Use define for drm property keys instead of defining as char pointers
 2015-01-06 00:03:48 +00:00
Andrew Hsieh
817e1ef487 Merge "Use define for drm property keys instead of defining as char pointers" 2015-01-05 23:51:01 +00:00
Deepanshu Gupta
2f69899132 am 55220fa0: am ef8e455e: am fe3a0a92: Reset SDK Platform Pkg revision for API 22 
* commit '55220fa0795f787d347d99d77779828e19eed786':
  Reset SDK Platform Pkg revision for API 22
 2015-01-05 23:42:52 +00:00
Deepanshu Gupta
55220fa079 am ef8e455e: am fe3a0a92: Reset SDK Platform Pkg revision for API 22 
* commit 'ef8e455e2050caf9ee2e8d018024c9e13c029849':
  Reset SDK Platform Pkg revision for API 22
 2015-01-05 23:37:01 +00:00
Deepanshu Gupta
748fb34d04 am 8d10f2de: Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE] 
* commit '8d10f2debbe78961e4aaf1c44328750f30c7e48b':
  Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]
 2015-01-05 23:33:20 +00:00
Deepanshu Gupta
ef8e455e20 am fe3a0a92: Reset SDK Platform Pkg revision for API 22 
* commit 'fe3a0a924bba274b8c3bdc5f937ed5507368c170':
  Reset SDK Platform Pkg revision for API 22
 2015-01-05 23:30:22 +00:00
Narayan Kamath
e971023a52 am 56f30b11: am f14a3951: Merge "Remove hardcoded ICU include paths." 
* commit '56f30b1143a17bbc4a062ae50e6d8d0587261579':
  Remove hardcoded ICU include paths.
 2015-01-05 18:03:48 +00:00
Narayan Kamath
56f30b1143 am f14a3951: Merge "Remove hardcoded ICU include paths." 
* commit 'f14a39512af37ba6200e4eb9a9f80658d24a3d8a':
  Remove hardcoded ICU include paths.
 2015-01-05 17:56:21 +00:00
Narayan Kamath
f14a39512a Merge "Remove hardcoded ICU include paths." 2015-01-05 17:46:17 +00:00
Narayan Kamath
15b31c80b9 Remove hardcoded ICU include paths. 
ICU exports them using LOCAL_EXPORT_C_INCLUDE_DIRS.

Note that this makefile doesn't building anything
(it's used to test a mk file parser) but it's probably best to
remove all hardcoded references to these paths.

bug: 18581021
Change-Id: Ie3320b405b18a69f35edda510242ef243960b796
 2015-01-05 17:44:27 +00:00
Martin Storsjo
2202e9414a Use define for drm property keys instead of defining as char pointers 
When defined as char pointers, every compilation unit that includes
the NdkMediaDrm.h header defines a new copy of the same global
variables - leading to linker errors due to multiple definitions
if more than one file includes it.

By using a define, they don't generate any symbols. The NdkMediaFormat.h
header uses extern const char* for a similar set of keys, but that
can't be added after the actual platform has shipped. The other
alternative would be to declare them as static const char*, which
wouldn't generate global symbols, but which could trigger warnings
about unused static symbols instead.

The same change has already been applied in frameworks/av in
https://android-review.googlesource.com/120303.

Change-Id: I14ca81d94309b7f437b3bc144920c48a8b3f0261
 2015-01-05 18:52:13 +02:00
Deepanshu Gupta
8d10f2debb Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE] 
Added the do not merge tag so that it doesn't conflict with the version
number for the next API level.

Change-Id: Id9951894f845bdec2c6df9f923f9fbf67c9c2cfb
 2014-12-31 00:20:56 +00:00
Deepanshu Gupta
fe3a0a924b Reset SDK Platform Pkg revision for API 22 
Reset the SDK Platform and LayoutLib revision numbers for the new API
level.

Change-Id: I03104600edbc7f365eeedc29a9c80602abe3a3aa
 2014-12-30 16:18:51 -08:00
Craig Stout
24ad89cd2b Default to using wrap content for row height. 
Change-Id: I902b292726bdf8fa1d2134b00fde1385cbccc4ae
 2014-12-23 11:56:40 -08:00
Lorenzo Colitti
cdaf5c4478 am d0834b36: am 864b2b32: am 85018408: Add a button to the debug app to call reportBadNetwork. 
* commit 'd0834b363575d6cac6618124f3334720166473c6':
  Add a button to the debug app to call reportBadNetwork.
 2014-12-19 10:54:27 +00:00
Lorenzo Colitti
d0834b3635 am 864b2b32: am 85018408: Add a button to the debug app to call reportBadNetwork. 
* commit '864b2b32c393aa0f9fc29bb78116165926068dca':
  Add a button to the debug app to call reportBadNetwork.
 2014-12-19 10:47:29 +00:00
Lorenzo Colitti
864b2b32c3 am 85018408: Add a button to the debug app to call reportBadNetwork. 
* commit '8501840869111d20e324ba3bfd7a5e5ebe9c0f1c':
  Add a button to the debug app to call reportBadNetwork.
 2014-12-19 10:41:14 +00:00
Lorenzo Colitti
8501840869 Add a button to the debug app to call reportBadNetwork. 
Bug: 18777225
Change-Id: I964f3deb60ea509dfb647a01d2b7b357dd47209b
 2014-12-17 14:22:11 +09:00
Trevor Johns
bcc85ef119 am b64e11f4: (-s ours) am d62c4e43: am 3666bde1: am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE) 
* commit 'b64e11f4b13864e32a39dae57c41040d5d036163':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
 2014-12-16 11:03:18 +00:00
Trevor Johns
c80d9e6c60 am a6aa0a4a: am 659e1ca0: am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree 
* commit 'a6aa0a4aedbc2724b424e5644345b3baba0cfc7e':
  Add new samples to sdk.atree
 2014-12-16 11:03:16 +00:00
Trevor Johns
b64e11f4b1 am d62c4e43: am 3666bde1: am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE) 
* commit 'd62c4e43fbee591f4cfbc4fdfeee87072d487061':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
 2014-12-16 04:01:50 +00:00
Trevor Johns
a6aa0a4aed am 659e1ca0: am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree 
* commit '659e1ca0c74d25df65aa761ce705273de33e0cc3':
  Add new samples to sdk.atree
 2014-12-16 04:01:44 +00:00
Trevor Johns
d62c4e43fb am 3666bde1: am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE) 
* commit '3666bde1a2785585d1dc62fe6eb6f5eb74cf5011':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
 2014-12-16 03:53:26 +00:00
Trevor Johns
659e1ca0c7 am 23e2194c: am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree 
* commit '23e2194cf94b213aed40a3106071c8c90895d15c':
  Add new samples to sdk.atree
 2014-12-16 03:53:24 +00:00
Trevor Johns
3666bde1a2 am 011c1614: am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE) 
* commit '011c16143323f1b6a5e3d0d3ac8659f48237b003':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
 2014-12-16 03:42:46 +00:00
Trevor Johns
23e2194cf9 am 2f3095d9: am cee6440c: am babfe028: Add new samples to sdk.atree 
* commit '2f3095d93b5ef30d89ab3d939676f03918d76227':
  Add new samples to sdk.atree
 2014-12-16 03:41:50 +00:00
Trevor Johns
011c161433 am 65c18817: am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE) 
* commit '65c1881776329fea22244908b9d41b5e78c664e9':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
 2014-12-13 03:08:36 +00:00
Trevor Johns
65c1881776 am 20d72ce3: Increment lmp-docs samples to revision 5 (DO NOT MERGE) 
* commit '20d72ce3dbb2e22f0e83e433ead6af974750866d':
  Increment lmp-docs samples to revision 5 (DO NOT MERGE)
 2014-12-13 02:59:19 +00:00
Trevor Johns
20d72ce3db Increment lmp-docs samples to revision 5 (DO NOT MERGE) 
Change-Id: Iea7e17c19fea38dc0c57ec15839a07f5cb4d7193
 2014-12-12 16:12:50 -08:00
Trevor Johns
2f3095d93b am cee6440c: am babfe028: Add new samples to sdk.atree 
* commit 'cee6440c2ae07d53d382b2972a228d7d6651d2f5':
  Add new samples to sdk.atree
 2014-12-12 21:38:58 +00:00
Trevor Johns
cee6440c2a am babfe028: Add new samples to sdk.atree 
* commit 'babfe02866d84a457381a7d4c895596c8ec75165':
  Add new samples to sdk.atree
 2014-12-12 21:32:14 +00:00
Dake Gu
687d28973b am 5e8a6785: am 529288b5: am 0e5993dc: Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev 
* commit '5e8a67856425a03d42411d1e508d56a0f5fd2bd2':
  Add test case for multiple row horizontal grid view
 2014-12-12 20:21:03 +00:00
Narayan Kamath
7ff8122cef Merge "Build against the specified targetSdkVersion." 2014-12-12 16:15:17 +00:00
Dake Gu
5e8a678564 am 529288b5: am 0e5993dc: Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev 
* commit '529288b59c9019e117a1f8a68659d2ef9c88a1f5':
  Add test case for multiple row horizontal grid view
 2014-12-12 14:41:35 +00:00
Narayan Kamath
56d7f3949e Build against the specified targetSdkVersion. 
bug: 18027885
Change-Id: Id8a1f979b1d7d28bb4a0428aed6adff1c568f72e
 2014-12-12 14:04:49 +00:00
Nick Korostelev
3a04958b9c Merge "Cleaned up usages of deprecated APIs" 2014-12-11 23:47:10 +00:00
Dake Gu
529288b59c am 0e5993dc: Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev 
* commit '0e5993dc2b566ae66961f898f64aedf226c930ec':
  Add test case for multiple row horizontal grid view
 2014-12-11 23:27:15 +00:00
Dake Gu
0e5993dc2b Merge "Add test case for multiple row horizontal grid view" into lmp-mr1-dev 2014-12-11 23:18:45 +00:00
Trevor Johns
babfe02866 Add new samples to sdk.atree 
- PermissionRequest
- DirectorySelection
- AppUsageStatistics
- ScreenCapture

Change-Id: I78d70f47dab54bc40a0e4e320ce6f8799b2cc785
 2014-12-11 15:12:05 -08:00
Dake Gu
d17b2e78e8 Add test case for multiple row horizontal grid view 
Add test case for update dataset at last row with empty space.

b/18631342
b/18718926

Change-Id: I3c745a41b0486cf293fc6a5a595e50f0a14ee0d0
 2014-12-11 14:59:12 -08:00
Yohann Roussel
dbffc46d3c Merge "Add jack.jar dependency when using transform-jar-to-jack" 2014-12-11 12:27:49 +00:00
Trevor Johns
c51b9edc92 am 641bc913: am f95ac6f0: am b3493a55: am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs 
* commit '641bc913e37b95be20d7ee41a8a50d4afe4cefa1':
  Docs: Sync browseable samples for lmp-docs
 2014-12-10 22:29:53 +00:00
Trevor Johns
641bc913e3 am f95ac6f0: am b3493a55: am 2452c088: am 82365c20: am abededd8: Docs: Sync browseable samples for lmp-docs 
* commit 'f95ac6f06d9f9f5c84d331f62c3b8a18b55458b8':
  Docs: Sync browseable samples for lmp-docs
 2014-12-10 22:20:28 +00:00
Dake Gu
0058c9326f am f96ced67: am 3cc97974: am 2dbbfbbf: Merge "Add RowsFragment example" into lmp-mr1-dev 
* commit 'f96ced677150d5629694015dd7870507e0cdc985':
  Add RowsFragment example
 2014-12-10 21:56:03 +00:00
Yohann Roussel
491a3adb8d Add jack.jar dependency when using transform-jar-to-jack 
(cherry picked from commit 7324414107678ab1bcc3ed94b3c92aa36686d71d)

Change-Id: I7b3aadc1e12c31d5e88dc0c38e95e367103bc55f
 2014-12-10 10:10:12 +01:00