Adrian Roos
dded89c1be
Merge "Fix sample device admin"
2014-05-23 10:27:07 +00:00
Evan Charlton
08d98a2587
Merge "Add support for OSX to intellij-gen.sh"
2014-05-22 22:27:33 +00:00
Adrian Roos
212e67253b
Fix sample device admin
...
Changes to some checkboxes were only applied
after changing another checkbox / stopping and resuming the activity.
Change-Id: Idec3461e60786d97000402badcc3a66b1bf33a82
2014-05-22 20:05:20 +00:00
Xavier Ducrohet
bf3db3de59
resolved conflicts for merge of c32cb704 to master
...
Change-Id: Ib1c6dba900a25a52a28f09de0848fba55c873117
2014-05-22 11:25:39 -07:00
Jeff Sharkey
20f2e640a6
Merge "Extend Vault with directory selection, renaming."
2014-05-22 17:35:52 +00:00
Xavier Ducrohet
c32cb7040f
am f8a99a45: Reset version number to .0.0 for new API level SDK.
...
* commit 'f8a99a451bfbdcf75bb2c835f17cc8471321cbe2':
Reset version number to .0.0 for new API level SDK.
2014-05-22 16:46:31 +00:00
Jeff Sharkey
7feee23faf
Extend Vault with directory selection, renaming.
...
Bug: 12350110
Change-Id: I41747fdffa79688163c32392ffbeb78320717f92
2014-05-22 09:27:52 -07:00
Xavier Ducrohet
f8a99a451b
Reset version number to .0.0 for new API level SDK.
...
Change-Id: I0765de9dbb4f354c0b0a411b71bfcecb6797c632
2014-05-22 09:27:02 -07:00
Jerome Poichet
ec0df8cc31
Merge "Adding AUDIO_RECORD permission"
2014-05-22 07:03:03 +00:00
Jeff Sharkey
da58ea7469
Merge "Example code to test renaming documents."
2014-05-22 05:48:30 +00:00
Jeff Sharkey
5214072d6c
Example code to test renaming documents.
...
Bug: 12350110
Change-Id: I6be7bd1cd93b8c1c83f05496157534d879f2f223
2014-05-21 22:25:18 -07:00
Jerome Poichet
0592982602
Adding AUDIO_RECORD permission
...
Need AUDIO_RECORD permission to support audio in search
Change-Id: I65eb1180eeb7506d678d75e61eb9e5d01fc4bf41
2014-05-21 22:27:44 +00:00
Jerome Poichet
250b336c2b
Merge "Using new search fragment parameters"
2014-05-21 22:27:10 +00:00
Jerome Poichet
999a29a664
Using new search fragment parameters
...
Change-Id: I4fc3994bed5b17b4c84e12881e1c095b040304de
2014-05-21 15:16:48 -07:00
Raphael Moll
6f2b614418
am f7863319: am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master
...
* commit 'f786331925d50c2235f298e39880a9a05670b0dd':
Fix SDK build.
2014-05-21 00:01:29 +00: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
bf164835e6
Merge "Fix SDK build."
2014-05-20 21:12:26 +00: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
Raphael Moll
e657db091b
Merge "Ability to generate SDK system-images for arm64 and x86_64"
2014-05-20 19:49:40 +00:00
Evan Charlton
ffa8245e66
Add support for OSX to intellij-gen.sh
...
Remove the hardcoded "linux-x86" path, and add support for darwin-x86.
Change-Id: I4c5db4683a6e8aac7d894e64415142d2ca5954a2
2014-05-20 10:55:54 -07:00
George Mount
6ccc20a0aa
Update activity transition API.
...
Change-Id: Ic9f2ead3a6841ae7c11e38098aaf26a2b6e613fd
2014-05-19 16:26:25 -07:00
Raphael Moll
40c7126e7c
Ability to generate SDK system-images for arm64 and x86_64
...
Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
2014-05-19 10:25:09 -07:00
Andrew Hsieh
9700e9824f
am 9d0a4a6e: am 5f3ed7dd: am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"
...
* commit '9d0a4a6eca86933e9cd1fd60ba8cc0abae351b2a':
Refresh 64-bit headers/libs (WW20)
2014-05-19 01:32:52 +00:00
Andrew Hsieh
9d0a4a6eca
am 5f3ed7dd: am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"
...
* commit '5f3ed7ddd0b3708baadf5ce357c74e331c16f986':
Refresh 64-bit headers/libs (WW20)
2014-05-19 01:29:21 +00:00
Andrew Hsieh
5f3ed7ddd0
am 80bc4f93: Merge "Refresh 64-bit headers/libs (WW20)"
...
* commit '80bc4f931edb0c56473ba89a132e56ac99995420':
Refresh 64-bit headers/libs (WW20)
2014-05-19 01:26:02 +00:00
Andrew Hsieh
80bc4f931e
Merge "Refresh 64-bit headers/libs (WW20)"
2014-05-19 01:21:47 +00:00
Chet Haase
84be2d11a5
am 98253982: am 3b3ab0e0: Add demo for animating RecyclerView actions
...
* commit '98253982ea6b616e80704d68a541b242c887b807':
Add demo for animating RecyclerView actions
2014-05-17 16:04:03 +00:00
Chet Haase
98253982ea
am 3b3ab0e0: Add demo for animating RecyclerView actions
...
* commit '3b3ab0e040ecbeee2f916b969b1044a2b9e222bd':
Add demo for animating RecyclerView actions
2014-05-17 16:00:45 +00:00
Chet Haase
3b3ab0e040
Add demo for animating RecyclerView actions
...
Change-Id: Ie076db6646cf734706fe2ea8659ee57f3a7742e9
2014-05-17 15:21:44 +00:00
Andrew Hsieh
2c91491806
Refresh 64-bit headers/libs (WW20)
...
Change-Id: I91c4a89635a075d2264e43c51f56b70fe999152f
2014-05-17 06:37:26 +08:00
Raphael Moll
136f00c234
am 7401fa16: am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
...
* commit '7401fa161f9f6bf66965cc71528ae1cdeb99b620':
SDK: support generating repository XML with latest XSD.
2014-05-16 20:18:12 +00:00
Raphael Moll
7401fa161f
am 8aa49aef: am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
...
* commit '8aa49aef8adb24a1b977d89b60a48a781e4e6674':
SDK: support generating repository XML with latest XSD.
2014-05-16 20:12:42 +00:00
Raphael Moll
8aa49aef8a
am f9f829e5: Merge "SDK: support generating repository XML with latest XSD."
...
* commit 'f9f829e51afe3906458a81cb4efb75a051c64c04':
SDK: support generating repository XML with latest XSD.
2014-05-16 20:09:40 +00:00
Raphael Moll
f9f829e51a
Merge "SDK: support generating repository XML with latest XSD."
2014-05-16 20:05:47 +00:00
Andrew Hsieh
49a41dac24
am e21f842a: am 44e42e61: am 67dc50cb: Merge changes Ie67acf11,Ia9c03558
...
* commit 'e21f842a0301c8cac3244d051f304f4682960bf1':
Remove non-existanec functions/variables from libc.so
Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:24:43 +00:00
Andrew Hsieh
0fb9b47d59
am 908d100e: am fa00a604: am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
...
* commit '908d100eff523f3c6c677a22ff45b0659468b77f':
Update lib-boostrape for 64-bit libraries built with GCC toolchain
2014-05-16 03:24:42 +00:00
Andrew Hsieh
e21f842a03
am 44e42e61: am 67dc50cb: Merge changes Ie67acf11,Ia9c03558
...
* commit '44e42e61ab33b2dc094729a2bd24d7eba5ddbecc':
Remove non-existanec functions/variables from libc.so
Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:22:16 +00:00
Andrew Hsieh
908d100eff
am fa00a604: am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
...
* commit 'fa00a60465f3f712193ee062b13be5f79b5d1ba9':
Update lib-boostrape for 64-bit libraries built with GCC toolchain
2014-05-16 03:22:15 +00:00
Andrew Hsieh
44e42e61ab
am 67dc50cb: Merge changes Ie67acf11,Ia9c03558
...
* commit '67dc50cbbbf5d3cf873495d4d5ae1e67f29ffe9e':
Remove non-existanec functions/variables from libc.so
Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:18:38 +00:00
Andrew Hsieh
fa00a60465
am abc6d891: Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
...
* commit 'abc6d891a037e33fe70cc24a032efa58a10d16fa':
Update lib-boostrape for 64-bit libraries built with GCC toolchain
2014-05-16 03:18:36 +00:00
Andrew Hsieh
67dc50cbbb
Merge changes Ie67acf11,Ia9c03558
...
* changes:
Remove non-existanec functions/variables from libc.so
Restore stdint.h for android-3..19 to the original headers
2014-05-16 03:17:19 +00:00
Andrew Hsieh
abc6d891a0
Merge "Update lib-boostrape for 64-bit libraries built with GCC toolchain"
2014-05-16 03:16:21 +00:00
Raphael Moll
ea40d2f4c5
SDK: support generating repository XML with latest XSD.
...
The latest version of the repository XSD changes:
- archive attributes (os/arch) are now element (host-os)
- system images are not longer in the repository.xml and
get their own XML file.
Change-Id: If5820a84d5c754b816b17b5713bbdb2597736eff
2014-05-15 17:49:02 -07:00
Andrew Hsieh
6f22770079
am 0810f8a6: am 7e3d050a: am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."
...
* commit '0810f8a6ec30dc3d8351ec204ed0988b27390a3c':
Update android-20 wchar.h up to bionic state.
2014-05-16 00:37:10 +00:00
Andrew Hsieh
0810f8a6ec
am 7e3d050a: am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."
...
* commit '7e3d050add2d534b6e48353362cf7598f5f8f3f7':
Update android-20 wchar.h up to bionic state.
2014-05-16 00:34:09 +00:00
Andrew Hsieh
7e3d050add
am 2f35f1fa: Merge "Update android-20 wchar.h up to bionic state."
...
* commit '2f35f1fa51db20695be65668986e44dd80da9616':
Update android-20 wchar.h up to bionic state.
2014-05-16 00:30:21 +00:00
Andrew Hsieh
2f35f1fa51
Merge "Update android-20 wchar.h up to bionic state."
2014-05-16 00:27:28 +00:00
George Mount
0c5700b4e6
Merge "New activity transition API."
2014-05-15 14:50:10 +00:00
Arseniy Antonov
4e1ef36772
Update android-20 wchar.h up to bionic state.
...
Corresponding changes in bionic:
Ia9bd0785bc42c7b46e2bb6c3d9b9a9d3f769d983
I5abdc7cc3c27c109b7900c94b112f18a95c35763
Change-Id: Ie86fd15226fe552b6f0e60c24debbe1d79f7a332
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com >
2014-05-15 18:48:19 +04:00