124934 Commits

Author SHA1 Message Date
Narayan Kamath
f152d95085 am 33a608a0: am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '33a608a0a326d9671bffd6750cb5521d6687cc57':
  AArch64: Use long for pointers in RS Java/JNI code
2014-02-10 13:45:15 +00:00
Narayan Kamath
33a608a0a3 am 578d4f5f: am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '578d4f5f50b3b8969125376d696e893dc355faa6':
  AArch64: Use long for pointers in RS Java/JNI code
2014-02-10 13:39:39 +00:00
Narayan Kamath
578d4f5f50 am 56062983: Merge "AArch64: Use long for pointers in RS Java/JNI code"
* commit '56062983f1e07295c812fba0e22ce579a35b6f76':
  AArch64: Use long for pointers in RS Java/JNI code
2014-02-10 05:37:18 -08:00
Dan Sandler
cd0318f6f4 am 694a022c: am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '694a022cb613424261a9753250e1c9a20955a4cf':
  Make sure to turn off led after pulse()
2014-02-10 05:33:34 -08:00
Narayan Kamath
56062983f1 Merge "AArch64: Use long for pointers in RS Java/JNI code" 2014-02-10 13:33:26 +00:00
Katie McCormick
dd99d87a12 am ffc641dd: am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit 'ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3':
  Doc update: misc GCM fixes
2014-02-10 13:16:42 +00:00
Dirk Dougherty
7dd9c23778 am 91bdc7d4: am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '91bdc7d4bed9e98db0a8d079a993cf90538e2a66':
  Doc change: add carousel and spotlight for developer video.
2014-02-10 13:16:38 +00:00
Craig Mautner
e666350e12 am e03ed510: am 4e5b67e6: Queue startActivity params if not yet ready.
* commit 'e03ed51068bcb4253e2fd2a4a3f39a7e580a721a':
  Queue startActivity params if not yet ready.
2014-02-10 12:51:24 +00:00
Craig Mautner
56aa06c424 am 779d204a: am 9ef471f7: Don\'t remove Activities and Tasks until animation done
* commit '779d204abe6a3922b572822df5cd775ffd5d77e8':
  Don't remove Activities and Tasks until animation done
2014-02-10 12:51:19 +00:00
Christopher Tate
d8efad825d am 88daefd4: am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app"
* commit '88daefd40767695f7e8a67d1d52dfaac2ab6bdb6':
  Use canonical path for /vendor/app
2014-02-10 12:51:15 +00:00
John Spurlock
406b5f074e am cd4cf932: am 6691bfd6: am cccae25f: Merge "Example controller app for system ui demo mode."
* commit 'cd4cf932d994c392ca6da21dc32a26d6d467b721':
  Example controller app for system ui demo mode.
2014-02-10 12:51:06 +00:00
Jean-Luc Brouillet
774220fa0b am ecc8ee64: am 8067c9ec: am 11e6cabc: Merge "Fix a typo."
* commit 'ecc8ee649578c2bb859c639c361d5a24005b9200':
  Fix a typo.
2014-02-10 12:51:01 +00:00
Dan Sandler
694a022cb6 am 9e07c1c4: am 6b1f3acd: am 6ea720ba: Merge "Make sure to turn off led after pulse()"
* commit '9e07c1c4f333171bff6e1cf1c4408e5738bcf127':
  Make sure to turn off led after pulse()
2014-02-10 12:50:24 +00:00
Colin Cross
d06969518b frameworks/base: fix errors inside ALOGV
Fix errors exposed by adding compile-time checking to disabled ALOGVs.

Change-Id: I9beeb5d5df498c63d6bed49734ee80a8e0afcefc
2014-02-09 21:54:01 -08:00
Katie McCormick
ffc641dd54 am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '6366dcbd494afe20912a932bb18faf199e4a1c62':
  Doc update: misc GCM fixes
2014-02-08 18:44:52 +00:00
Dirk Dougherty
91bdc7d4be am 33331667: am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '3333166738ca1382307bcf61e30adba6bdec83d4':
  Doc change: add carousel and spotlight for developer video.
2014-02-08 18:44:49 +00:00
Katie McCormick
6366dcbd49 am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit 'bcc27903fb4b9581f2b6912d767cccb2d1c2e1ba':
  Doc update: misc GCM fixes
2014-02-08 18:39:07 +00:00
Dirk Dougherty
3333166738 am 3f43b646: am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '3f43b646294857ea2dbd5e2fba944ee0d4c19657':
  Doc change: add carousel and spotlight for developer video.
2014-02-08 18:39:01 +00:00
Katie McCormick
bcc27903fb am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '44085b68add3d7583f7832c51409de83655fc4f1':
  Doc update: misc GCM fixes
2014-02-08 18:34:54 +00:00
Dirk Dougherty
3f43b64629 am 7fd4d29e: am 392ddb22: Merge "Doc change: add carousel and spotlight for developer video." into klp-docs
* commit '7fd4d29e847984c02561c7f385bfe0947432012e':
  Doc change: add carousel and spotlight for developer video.
2014-02-08 18:34:44 +00:00
Igor Murashkin
0b6bc72a09 am a0ab96d1: Merge "camera2: Simplify min frame durations and add available stream configs"
* commit 'a0ab96d1a757b737fd816ae2b4d24bf6127a09b5':
  camera2: Simplify min frame durations and add available stream configs
2014-02-07 18:56:20 -08:00
Igor Murashkin
a0ab96d1a7 Merge "camera2: Simplify min frame durations and add available stream configs" 2014-02-08 02:54:03 +00:00
Igor Murashkin
a23ffb5f50 camera2: Simplify min frame durations and add available stream configs
Change-Id: I41951c9a50a333e8e47d0ba616c316c065b604e8
2014-02-07 18:52:50 -08:00
Ruben Brunk
cf5a84c78c am ad0aa838: Merge "camera2: Update hotpixel tags."
* commit 'ad0aa8383cd0f951ff546cbd4ff8cd84396df74c':
  camera2: Update hotpixel tags.
2014-02-07 18:42:59 -08:00
Ruben Brunk
ad0aa8383c Merge "camera2: Update hotpixel tags." 2014-02-08 02:39:22 +00:00
Ruben Brunk
eba1b3a843 camera2: Update hotpixel tags.
Change-Id: I6e2931d54a92f3852e8abe8c480f1762c92655ad
2014-02-07 18:38:46 -08:00
Igor Murashkin
94d96f427b am d531f88f: Merge "camera2: Add tags for querying capabilities of a camera device"
* commit 'd531f88fddf48b370bc1fe67e161cc1a290f04eb':
  camera2: Add tags for querying capabilities of a camera device
2014-02-07 18:37:18 -08:00
Igor Murashkin
d531f88fdd Merge "camera2: Add tags for querying capabilities of a camera device" 2014-02-08 02:35:49 +00:00
Igor Murashkin
e46c0dad37 camera2: Add tags for querying capabilities of a camera device
Change-Id: I955b514f9fe66205d241cd4072aa6ddf71efb53c
2014-02-07 18:35:11 -08:00
Igor Murashkin
2437fcf5cd am 672ad888: Merge "camera2: Add android.scaler.availableInputOutputFormatsMap"
* commit '672ad888d2e05a85d3127f79932ca37dd9ec172e':
  camera2: Add android.scaler.availableInputOutputFormatsMap
2014-02-07 18:26:00 -08:00
Igor Murashkin
672ad888d2 Merge "camera2: Add android.scaler.availableInputOutputFormatsMap" 2014-02-08 02:22:55 +00:00
Igor Murashkin
418f6df836 camera2: Add android.scaler.availableInputOutputFormatsMap
Change-Id: I2f0000614063f4004aa90ad1846936bf85db0389
2014-02-07 18:20:48 -08:00
Ruben Brunk
e573745b71 am d5fdd1c1: camera3: Update raw color calibration transform tags.
* commit 'd5fdd1c112b475fbe1f927406c17babead8cb061':
  camera3: Update raw color calibration transform tags.
2014-02-07 18:04:30 -08:00
Katie McCormick
44085b68ad am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit 'f2fcbff8382b93bd779af546a7dda8f85eba3763':
  Doc update: misc GCM fixes
2014-02-08 01:58:53 +00:00
Katie McCormick
f2fcbff838 Merge "Doc update: misc GCM fixes" into klp-docs 2014-02-08 01:55:44 +00:00
Katie McCormick
63b2b8cbf8 Doc update: misc GCM fixes
Fixes for:

b/12909231
b/12887320
b/12872407

Change-Id: I1fefb41f7ceea2e4e80262834d1c631b6b8daf7e
2014-02-07 17:43:22 -08:00
Ruben Brunk
d5fdd1c112 camera3: Update raw color calibration transform tags.
Change-Id: Ic7a8c68e83b3eb257bd15380baad6370c5eb0dbc
2014-02-07 17:39:53 -08:00
Ruben Brunk
4eae8fcd53 am b7b2de78: Fixbuild. Add api update for camera profile tags.
* commit 'b7b2de7843f47d31c9c38d01ecee873fe56b2b31':
  Fixbuild.  Add api update for camera profile tags.
2014-02-07 17:22:41 -08:00
Ruben Brunk
b7b2de7843 Fixbuild. Add api update for camera profile tags.
Change-Id: Id25801ee3f17b721c6d5335a8a8d21041bec068f
2014-02-07 17:19:27 -08:00
Ruben Brunk
f4437333f2 am a9bfdbbb: camera3: Add camera profile properties.
* commit 'a9bfdbbb35cb6c93e943b8ab809d95d68d3da46e':
  camera3: Add camera profile properties.
2014-02-07 17:01:31 -08:00
Ruben Brunk
a9bfdbbb35 camera3: Add camera profile properties.
Change-Id: I39f6067bb1c05b8b00b0205bb367312112407299
2014-02-07 16:58:09 -08:00
Zhijun He
3158472cc4 am 8954f6f0: Merge "Camera2: Add OFF_KEEP_STATE mode"
* commit '8954f6f0b2187f1d8269718df022fc618b581720':
  Camera2: Add OFF_KEEP_STATE mode
2014-02-07 16:38:33 -08:00
Zhijun He
8954f6f0b2 Merge "Camera2: Add OFF_KEEP_STATE mode" 2014-02-08 00:36:17 +00:00
Ruben Brunk
9408be9dbb am aa1567f9: Merge "camera3: Make blackLevelPattern optional."
* commit 'aa1567f9ba3611647968ab7786fd3a51abeffb32':
  camera3: Make blackLevelPattern optional.
2014-02-07 16:15:18 -08:00
Zhijun He
2d5e89778e Camera2: Add OFF_KEEP_STATE mode
Change-Id: I8802339a6b6d8a009f3ba790ffad23c0fcbbfa94
2014-02-07 16:13:46 -08:00
Ruben Brunk
aa1567f9ba Merge "camera3: Make blackLevelPattern optional." 2014-02-08 00:12:46 +00:00
Ruben Brunk
1ef676f23c camera3: Make blackLevelPattern optional.
Change-Id: Ic7b115e9f6361e158e7af13442bb781bbf351cbf
2014-02-07 16:08:38 -08:00
Zhijun He
621f0e74c9 am 12b805bb: Merge "Camera2: Update focus distance related tags"
* commit '12b805bb5a0bb186e1756b28cece9eb64ff6d598':
  Camera2: Update focus distance related tags
2014-02-07 16:02:58 -08:00
Chris Craik
b67a7bf27b Add shadow casting / global perspective APIs, hidden for now.
Global perspective isn't yet hooked up in rendering.

Change-Id: I64ad272ea5dc523505260ce114f0a6bebdcfe9dc
2014-02-07 16:02:51 -08:00
Zhijun He
12b805bb5a Merge "Camera2: Update focus distance related tags" 2014-02-07 23:59:42 +00:00