The Android Open Source Project
84c68cad1e
am f3c5b01d: Reconcile with jb-mr0-release jb-release
...
* commit 'f3c5b01d6d1a1a3ca1b2df4032849948a60bcbc4':
2012-07-27 15:45:27 -07:00
The Android Open Source Project
f3c5b01d6d
Reconcile with jb-mr0-release jb-release
...
Change-Id: I64ab1cee03a49427cd6fe1468f984cd3c113d8b1
2012-07-27 14:50:18 -07:00
The Android Automerger
dd89937aa3
merge in jb-mr0-release history after reset to jb-dev
2012-07-26 17:49:27 -07:00
Scott Main
1a14e24067
am 1aeb3525: am 3a76c1fd: Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev
...
* commit '1aeb3525e1a49ed654eb7fe1855f40aa0d1c1b0d':
docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site.
2012-07-26 15:42:50 -07:00
Scott Main
1aeb3525e1
am 3a76c1fd: Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev
...
* commit '3a76c1fd1b99c7c2f6df19ec54d4948c9dd1b204':
docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site.
2012-07-26 15:41:33 -07:00
Scott Main
3a76c1fd1b
Merge "docs: move all ZIP files for training classes here, originally from the html/shareables/ directory to save space on the developer site." into jb-dev
2012-07-26 15:39:44 -07:00
Xavier Ducrohet
a9df473153
am efce10c7: am 6ca669e4: Merge "Update support lib to r10." into jb-dev
...
* commit 'efce10c7f8f0085cb32723030f5dc8e17d55cbca':
Update support lib to r10.
2012-07-26 13:18:47 -07:00
Xavier Ducrohet
efce10c7f8
am 6ca669e4: Merge "Update support lib to r10." into jb-dev
...
* commit '6ca669e435e3f2dd8dfc084d318b856bcaa1f9a7':
Update support lib to r10.
2012-07-26 13:17:01 -07:00
Xavier Ducrohet
6ca669e435
Merge "Update support lib to r10." into jb-dev
2012-07-26 13:15:21 -07:00
Xavier Ducrohet
2a7c34af40
Update support lib to r10.
...
Change-Id: Ic0c4546566c237cda17d3e4820554424e0e885dd
2012-07-26 13:14:51 -07:00
Eino-Ville Talvala
05940c4d69
Camera2: Use lower resolutions for front fake camera. DO NOT MERGE
...
To differentiate front/back fake camera, support a lower set of
resolutions for the front camera processed and jpeg streams.
Bug: 6243944
Change-Id: I4a8746500944f7b445e0e5f0a3f441885733a7a4
2012-07-26 10:04:38 -07:00
Eino-Ville Talvala
1e903b0745
Camera2: Fix deadlock issues with getInProgressCount. DO NOT MERGE
...
Bug: 6243944
Change-Id: Icb32e4b8c4a916eb7c97ac18767cadfc5122ec88
2012-07-26 10:04:16 -07:00
Eino-Ville Talvala
b0bd05236f
EmulatedFakeCamera2: Add recording support for 320x240, NV21. DO NOT MERGE
...
- Support 320x240 in addition to 640x480
- Support NV21 (monochrome only right now)
- Base simulated time on system time,
since stagefright cares about timestamp base
- Use emulator magic gralloc format to enable gralloc to pick format based on
destination.
Bug: 6243944
Change-Id: I3ea56bca726c69b51e03233ce86d4881401a3ffd
2012-07-26 10:03:35 -07:00
Eino-Ville Talvala
4d57cb8d65
gralloc: Add automatic format selection. DO NOT MERGE
...
Have gralloc_alloc be able to select the appropriate pixel format
given the endpoints, triggered by new
GRALLOC_EMULATOR_PIXEL_FORMAT_AUTO format.
Currently supports camera->screen, and camera->video encoder.
Bug: 6243944
Change-Id: Ib1bf8da8d9184ac99e7f50aad09212c146c32809
2012-07-26 10:03:05 -07:00
Andrew Hsieh
8d0226a862
am 123f27e9: am 21f8a3c5: Merge "Add comments about why "call" instead of "jump" is used."
...
* commit '123f27e9fd5cfd6b1e157d9471e640ead43e007f':
Add comments about why "call" instead of "jump" is used.
2012-07-25 22:24:04 -07:00
Andrew Hsieh
123f27e9fd
am 21f8a3c5: Merge "Add comments about why "call" instead of "jump" is used."
...
* commit '21f8a3c51d15c3d270be3923f518e047eaee6d04':
Add comments about why "call" instead of "jump" is used.
2012-07-25 22:22:17 -07:00
Andrew Hsieh
21f8a3c51d
Merge "Add comments about why "call" instead of "jump" is used."
2012-07-25 16:04:53 -07:00
Andrew Hsieh
e395327a7c
Add comments about why "call" instead of "jump" is used.
...
Related CL: https://android-review.googlesource.com/#/c/38651
Change-Id: I425e06f08fda90501a686c7e437d4e70fc1e4a1b
2012-07-25 15:39:00 -07:00
Scott Main
5b9530f501
am fa251190: am d25c7917: Merge "docs: add redirect for l10n tutorial and fix a couple others" into jb-dev
...
* commit 'fa25119081fbbe6fc9210fa1fe2b195ffbde4ff7':
docs: add redirect for l10n tutorial and fix a couple others
2012-07-25 15:06:07 -07:00
Scott Main
d0f75a5ae3
docs: move all ZIP files for training classes here, originally
...
from the html/shareables/ directory to save space on the developer site.
Change-Id: I545e0002215b17aa0a2e8e261591652046308210
2012-07-25 14:51:20 -07:00
Scott Main
fa25119081
am d25c7917: Merge "docs: add redirect for l10n tutorial and fix a couple others" into jb-dev
...
* commit 'd25c7917b0f90a71a72842b17475744480d4096e':
docs: add redirect for l10n tutorial and fix a couple others
2012-07-25 14:39:58 -07:00
Scott Main
d25c7917b0
Merge "docs: add redirect for l10n tutorial and fix a couple others" into jb-dev
2012-07-25 14:37:49 -07:00
Scott Main
cdfe5ccf4e
docs: add redirect for l10n tutorial and fix a couple others
...
Change-Id: Ifd8bfdcfb7c0412cc75a4e77736b7ead978f6635
2012-07-25 12:54:41 -07:00
The Android Automerger
f89fa747e6
merge in jb-release history after reset to jb-dev
2012-07-24 20:23:09 -07:00
The Android Automerger
fab8424220
merge in jb-mr0-release history after reset to jb-dev
2012-07-24 12:39:24 -07:00
Andy Stadler
d720b263b1
Add telephony intermediates to classpath
...
Change-Id: I019e3f2d4d3eb570590a8d1758b82cc1c1669c19
2012-07-23 17:41:28 -07:00
Xavier Ducrohet
cefc43263a
am 3558deb1: am cfa5aac7: Update the SDK platform tools package to revision 14.
...
* commit '3558deb1d3782dbad250bbfeef850582acd23d9a':
Update the SDK platform tools package to revision 14.
2012-07-20 10:00:13 -07:00
Xavier Ducrohet
3558deb1d3
am cfa5aac7: Update the SDK platform tools package to revision 14.
...
* commit 'cfa5aac721b6e5d05ababa3a7643559624ceac01':
Update the SDK platform tools package to revision 14.
2012-07-19 14:33:06 -07:00
Xavier Ducrohet
cfa5aac721
Update the SDK platform tools package to revision 14.
...
Change-Id: Iaf6fa70f8cccce8ba8ecbb5121cf380e69c6b8fb
2012-07-19 13:33:26 -07:00
Fabrice Di Meglio
7a36ef3479
Merge "Update ApiDemos for ActionBar"
2012-07-19 13:29:25 -07:00
Colin Cross
d13daae464
am 643dc19d: am e592bc7c: Merge "Add libsparse to sdk whitelist"
...
* commit '643dc19d888af82c1dce08e54c834b7f07a30819':
Add libsparse to sdk whitelist
2012-07-19 12:00:47 -07:00
Colin Cross
643dc19d88
am e592bc7c: Merge "Add libsparse to sdk whitelist"
...
* commit 'e592bc7c065a45ff6be63b09ac167dcf32a01bb7':
Add libsparse to sdk whitelist
2012-07-19 11:55:38 -07:00
Colin Cross
e592bc7c06
Merge "Add libsparse to sdk whitelist"
2012-07-19 11:48:32 -07:00
The Android Open Source Project
781f3663a1
am aafb4609: Reconcile with jb-mr0-release jb-release
...
* commit 'aafb46093d1f453ba6f299a1910728f25037b068':
Move SDK system image package to rev 2.
2012-07-19 08:52:04 -07:00
The Android Open Source Project
aafb46093d
Reconcile with jb-mr0-release jb-release
...
Change-Id: I10c1743cce5380ca689dee0dad605ec2b3b43799
2012-07-19 08:36:18 -07:00
The Android Automerger
fd3470f9a3
merge in jb-release history after reset to jb-dev
2012-07-18 23:04:37 -07:00
Fabrice Di Meglio
161859ee84
Update ApiDemos for ActionBar
...
- use Gravity.START and Gravity.END
Change-Id: Id2adac4c23ad2de2d04a36ef8195367aea63c66f
2012-07-18 15:00:22 -07:00
Winson Chung
c2a22376da
Updating WeatherListWidget to use new resize callbacks. (Bug 6441164)
...
Change-Id: Ifc2730c564532147e5f60022955a7e97d3e1d855
2012-07-18 11:52:03 -07:00
Wink Saville
07d4bafc5d
Merge "Add opt/telephony and opt/mms to eclipse .classpath"
2012-07-17 16:06:10 -07:00
Wink Saville
d7269a0191
Add opt/telephony and opt/mms to eclipse .classpath
...
Change-Id: I7ac5ff06f72435dbe10463ca71413df1fde9e676
2012-07-17 15:20:47 -07:00
Wink Saville
58688e7ffd
am 4e0dd447: (-s ours) am 0275bc68: (-s ours) Use telephony-common and mms-common. - DO NOT MERGE
...
* commit '4e0dd447a6d0ec43c8f9ac79893da09dcb76a0cc':
Use telephony-common and mms-common. - DO NOT MERGE
2012-07-17 14:08:46 -07:00
Wink Saville
4e0dd447a6
am 0275bc68: (-s ours) Use telephony-common and mms-common. - DO NOT MERGE
...
* commit '0275bc68eae54a882bb27e534ca401fad3acc663':
Use telephony-common and mms-common. - DO NOT MERGE
2012-07-17 12:33:23 -07:00
The Android Automerger
0ce32aeb2e
merge in jb-mr0-release history after reset to jb-dev
2012-07-17 12:29:38 -07:00
Wink Saville
0275bc68ea
Use telephony-common and mms-common. - DO NOT MERGE
...
Change-Id: If2e6b49eb9ceafc43de107ce761163c654f3ee35
2012-07-17 12:23:03 -07:00
Stephen Hines
5709a0a3eb
Merge "Build RSHelloCompute for API 14."
2012-07-16 15:40:41 -07:00
Eino-Ville Talvala
bd1c139a5c
Merge "gralloc: Support HAL_PIXEL_FORMAT_YCrCb_420_SP (NV21)"
2012-07-16 14:26:44 -07:00
Stephen Hines
ab2fe6d4d2
Build RSHelloCompute for API 14.
...
Change-Id: I582434aa026b3a7ba3eb35d68faba2995808d062
2012-07-16 11:47:39 -07:00
Xavier Ducrohet
f0aa9b50db
am 2fb22b2c: am c8b44d4c: Update SDK platform-tools revision to 13.
...
* commit '2fb22b2c8b683f44f3bdc219d3a4fcaffd58338a':
Update SDK platform-tools revision to 13.
2012-07-16 11:17:04 -07:00
Xavier Ducrohet
2fb22b2c8b
am c8b44d4c: Update SDK platform-tools revision to 13.
...
* commit 'c8b44d4ceeb110b5c836e7a3ee5a1f1ed905d975':
Update SDK platform-tools revision to 13.
2012-07-16 11:14:13 -07:00
Xavier Ducrohet
c8b44d4cee
Update SDK platform-tools revision to 13.
...
Change-Id: I0eefe31df11e31892f3574c1f8c05025b766b4e1
2012-07-13 16:21:28 -07:00