Eino-Ville Talvala
a9345e02ba
am 3cb39916: am 7b8420e2: Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
...
* commit '3cb39916c1b4e36d7ddce2b5a504ce0c744074cf':
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
2012-09-04 12:32:25 -07:00
Eino-Ville Talvala
7f34893c98
am 9468d306: am c07123b1: Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
...
* commit '9468d306eea2749831e2630ec4261a8b1b3117c2':
EmulatedFakeCamera2: Add precapture trigger and reprocess support
2012-09-04 12:29:54 -07:00
Eino-Ville Talvala
7e2ae6af74
am f0063b29: Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
...
* commit 'f0063b298b078df61d7b80bfdbb9ea28515ed615':
Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
2012-09-04 12:29:29 -07:00
Eino-Ville Talvala
3cb39916c1
am 7b8420e2: Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
...
* commit '7b8420e2ab2759eaa44921285a76e3812e76644b':
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
2012-09-04 12:29:27 -07:00
Eino-Ville Talvala
f0063b298b
Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."" into jb-mr1-dev
2012-09-04 12:28:05 -07:00
Eino-Ville Talvala
9468d306ee
am c07123b1: Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
...
* commit 'c07123b1efa5dbc1ece200ed951700bb27276294':
EmulatedFakeCamera2: Add precapture trigger and reprocess support
2012-09-04 12:27:59 -07:00
Eino-Ville Talvala
7b8420e2ab
Merge "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"" into jb-mr1-dev
2012-09-04 12:27:56 -07:00
Eino-Ville Talvala
9642da5102
Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."
...
More dependent projects than I realized
This reverts commit a84522d2f3
Change-Id: Ifb50c94a2a5dfa91573f07695d8f3bfcadc79742
2012-09-04 12:27:04 -07:00
Eino-Ville Talvala
75832395dd
Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"
...
More dependent projects than I realized.
This reverts commit 4573a7194d
Change-Id: I53cfbc5cf5ef4436f5fa0c8b1ceb6296797e32fe
2012-09-04 12:26:21 -07:00
Eino-Ville Talvala
c07123b1ef
Merge "EmulatedFakeCamera2: Add precapture trigger and reprocess support" into jb-mr1-dev
2012-09-04 12:25:18 -07:00
Eino-Ville Talvala
50d68de6af
am 28125f96: am 4604e30d: Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
...
* commit '28125f96a830e17e02d1a7435b098486e6e42a02':
Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
2012-09-04 12:11:53 -07:00
Eino-Ville Talvala
28125f96a8
am 4604e30d: Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
...
* commit '4604e30da0ecf47232ff7fe74bd4c11363f3f35f':
Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
2012-09-04 12:09:58 -07:00
Eino-Ville Talvala
4604e30da0
Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage." into jb-mr1-dev
2012-09-04 12:07:25 -07:00
Dianne Hackborn
70d53bb0cc
am a80e74b7: am dbb1e6af: Fix some more.
...
* commit 'a80e74b710e3bc262395c7dbbfa3a82eb189ceb1':
Fix some more.
2012-09-04 11:27:30 -07:00
Dianne Hackborn
a80e74b710
am dbb1e6af: Fix some more.
...
* commit 'dbb1e6af7fc82ac5f615e46ddaa93ba1ee7c0094':
Fix some more.
2012-09-04 11:25:08 -07:00
Dianne Hackborn
dbb1e6af7f
Fix some more.
...
Change-Id: Ieeba0ba87f65eed25f3a0f23924fc99b90cc1d69
2012-09-04 11:20:29 -07:00
Eino-Ville Talvala
46a65b42aa
EmulatedFakeCamera2: Split AE/AWB mode and lock
...
Bug: 6243944
Change-Id: Ib7d311a04c687358317164f7f711dc293ecc0519
2012-09-04 09:23:21 -07:00
Eino-Ville Talvala
4573a7194d
EmulatedFakeCamera2: Add precapture trigger and reprocess support
...
- Manage the precapture protocol with trigger/AE notifications
- Support reprocessing from opaque format to JPEG
- Add a bit of exposure variation to scene
Bug: 6243944
Change-Id: Ic88f8f0ea641ddaf3e921849caf79dd3838665f8
2012-09-04 09:23:21 -07:00
Eino-Ville Talvala
a84522d2f3
Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.
...
This is needed for passing buffers to the camera HAL for reprocessing.
Bug: 6243944
Change-Id: Ibf8d15aead571ddb3b62674cf7afe0d508ca24e7
2012-09-04 09:23:17 -07:00
The Android Automerger
12ea2946b9
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-03 06:33:28 -07:00
Brett Chabot
7454171f17
Coverage and unbundling changes for runtest.
...
Stop using 'adb sync' in runtest. It was unreliable even when working
with full platform builds, and doesn't work at all for unbundled apps.
Instead, use output from build command to find produced artifacts and
use 'adb install' where possible.
However, note that this approach won't sync previously built artifacts
to device.
Also adjust to build system support for code coverage. Its no longer
required to build libcore to get code coverage.
Change-Id: I9c5d37897c9570d2d29db3ec82f5c53e60a8f485
2012-08-31 18:55:15 -07:00
Jeff Brown
c886b9b341
am d71b8c14: am 2e1fe78f: Add new sample for Presentation API.
...
* commit 'd71b8c142c5bdd08de0671584267e58611cf0cdc':
Add new sample for Presentation API.
2012-08-31 15:55:24 -07:00
Jeff Brown
d71b8c142c
am 2e1fe78f: Add new sample for Presentation API.
...
* commit '2e1fe78fbf01a1e6f454df0f4065410cbbc868bd':
Add new sample for Presentation API.
2012-08-31 15:52:09 -07:00
Jeff Brown
2e1fe78fbf
Add new sample for Presentation API.
...
Change-Id: Ia31deb9ca6ad9a4db1dd6f852c00fa9a94caa4c3
2012-08-31 15:22:34 -07:00
Xavier Ducrohet
c8d80a5361
am c4a1b250: am 341b0892: am df56d27b: (-s ours) am b1b6735c: Prepare for JB SDK rev 3
...
* commit 'c4a1b250a6e6d86463d1b7c34f2e29be5b2bdee5':
Prepare for JB SDK rev 3
2012-08-30 17:20:02 -07:00
Xavier Ducrohet
c4a1b250a6
am 341b0892: am df56d27b: (-s ours) am b1b6735c: Prepare for JB SDK rev 3
...
* commit '341b0892b74c3a1373326b428e0b3ba6fbdaa84d':
Prepare for JB SDK rev 3
2012-08-30 17:17:28 -07:00
Xavier Ducrohet
341b0892b7
am df56d27b: (-s ours) am b1b6735c: Prepare for JB SDK rev 3
...
* commit 'df56d27bea7c1f03d26b9c9837126bfe0f47e04e':
Prepare for JB SDK rev 3
2012-08-30 17:15:57 -07:00
Xavier Ducrohet
df56d27bea
am b1b6735c: Prepare for JB SDK rev 3
...
* commit 'b1b6735cd69121589bc9bdebb3f8967dc978166b':
Prepare for JB SDK rev 3
2012-08-30 16:06:25 -07:00
Eino-Ville Talvala
d692731553
am 2cb5c238: am cbb1d726: Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
...
* commit '2cb5c238cc6c37a66d29456bcca2167907e3fb7d':
EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
2012-08-30 09:42:45 -07:00
Eino-Ville Talvala
2cb5c238cc
am cbb1d726: Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
...
* commit 'cbb1d726c6dd79b20819f6f64cc1f48cd2e1fc0d':
EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED
2012-08-30 09:40:20 -07:00
Eino-Ville Talvala
cbb1d726c6
Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED" into jb-mr1-dev
2012-08-30 09:38:38 -07:00
Andrew Hsieh
18fb973c97
am a6dd6531: am bcb736ac: am bef6ec84: am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit 'a6dd6531ed6a669bd045af812f36a9afa60ee145':
Replace deprecated APIs in NDK samples
2012-08-30 08:31:02 -07:00
Andrew Hsieh
a6dd6531ed
am bcb736ac: am bef6ec84: am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit 'bcb736acf8d7d2c40dd50f0a50d3fef9c4e23eef':
Replace deprecated APIs in NDK samples
2012-08-30 08:29:10 -07:00
Andrew Hsieh
bcb736acf8
am bef6ec84: am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit 'bef6ec841ec7358dc09d564f0e38a9cb9f933293':
Replace deprecated APIs in NDK samples
2012-08-30 08:26:48 -07:00
Andrew Hsieh
bef6ec841e
am 3bc200de: am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit '3bc200de51c0afc6f954aaba5d029e1fb4d115e7':
Replace deprecated APIs in NDK samples
2012-08-30 08:25:04 -07:00
Andrew Hsieh
3bc200de51
am 9864b880: Merge "Replace deprecated APIs in NDK samples"
...
* commit '9864b8803782378159761424dee2270a12833872':
Replace deprecated APIs in NDK samples
2012-08-30 08:23:48 -07:00
Andrew Hsieh
9864b88037
Merge "Replace deprecated APIs in NDK samples"
2012-08-30 08:17:05 -07:00
The Android Automerger
405b3038a7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:33:26 -07:00
Andrew Hsieh
eb703bf543
Replace deprecated APIs in NDK samples
...
1. hello-gl2 from android-5 to android-7
2. native-activity from android-9 to android-10
3. native-audio from android-9 to android-10
4. native-plasma from android-9 to android-10
Related CL
https://android-review.googlesource.com/#/c/42218 , which
adjusts android-10 to use android-9 header/lib
Related issue:
http://code.google.com/p/android/issues/detail?id=20017
Change-Id: I49c4c0dd2cedb34522a9d196211ee96fce21b6c4
2012-08-30 13:02:53 +08:00
Xavier Ducrohet
b1b6735cd6
Prepare for JB SDK rev 3
...
Change-Id: I3b1beb1ff2e12ed39631f6f96379819a0cea6b3c
2012-08-29 16:36:54 -07:00
Doug Zongker
23b06c5502
am 0999f50b: am adf05af0: Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
...
* commit '0999f50b7208c2dcdb57bac95148d83651a1cacb':
add an app to generate localized text bitmaps needed for recovery
2012-08-29 16:32:02 -07:00
Doug Zongker
0999f50b72
am adf05af0: Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
...
* commit 'adf05af0b9f46638517241dce5cf7f6b9a7c48fe':
add an app to generate localized text bitmaps needed for recovery
2012-08-29 16:29:51 -07:00
Doug Zongker
adf05af0b9
Merge "add an app to generate localized text bitmaps needed for recovery" into jb-mr1-dev
2012-08-29 16:27:39 -07:00
Doug Zongker
a95366ae57
add an app to generate localized text bitmaps needed for recovery
...
Recovery only knows how to display images, so any text has to be
turned into bitmaps. This app displays each localized version of the
text in a TextView and then captures a bitmap, combining them and
generating an output PNG.
Change-Id: Ib16858a1d66e9839d1255b962fb1aaf8982bfe10
2012-08-29 16:04:12 -07:00
Jeff Brown
70ffc1bef0
am 75cd1b5b: am 99c82587: Merge "Use new display manager API." into jb-mr1-dev
...
* commit '75cd1b5bc411a599b9fbb632e96edcbdd9a0e1f8':
Use new display manager API.
2012-08-29 15:46:37 -07:00
Jeff Brown
75cd1b5bc4
am 99c82587: Merge "Use new display manager API." into jb-mr1-dev
...
* commit '99c82587b170497eeb8518db79beba8625038019':
Use new display manager API.
2012-08-29 15:44:48 -07:00
Jeff Brown
99c82587b1
Merge "Use new display manager API." into jb-mr1-dev
2012-08-29 15:42:18 -07:00
The Android Automerger
0aa706d541
merge in jb-release history after reset to jb-dev
2012-08-29 14:29:50 -07:00
The Android Automerger
37820ad511
merge in jb-release history after reset to jb-dev
2012-08-29 12:43:03 -07:00
Raphael Moll
faaab7f0ef
am 6a7a7de5: am 76bb1467: am 980822ca: am 0c11d925: am 3fda35f2: Merge "Windows USB Driver for generic + Q, rev 7."
...
* commit '6a7a7de58032aa76af7ba829ac7743db13206edb':
Windows USB Driver for generic + Q, rev 7.
2012-08-29 11:14:54 -07:00