Chris Craik
967c7fb2af
Merge "Fix projection offset caching"
2014-01-29 21:20:36 +00:00
Chong Zhang
2f03f90d85
Merge "change Surface constructor arg to 64bit"
2014-01-29 21:09:20 +00:00
Chong Zhang
af608e81d4
change Surface constructor arg to 64bit
...
Bug: 12799017
Bug: 12799384
Change-Id: Ic16b4fa5394df38cee0378b6e00d1808b9c8cb94
2014-01-29 13:07:43 -08:00
Chris Craik
d04a6b15f7
Fix projection offset caching
...
Because the caching of projection matrix didn't account for changes in
the offset flag, the flag could be ignored. Now we use both to verify
that the cached matrix can be used.
Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd
2014-01-29 13:04:33 -08:00
Dan Sandler
4d67c3a070
Merge "Fix NPE in empty SizeAdaptiveLayouts."
2014-01-29 17:26:32 +00:00
John Spurlock
77b17f335d
am 2ad24e74: am 15c09e1e: am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
...
* commit '2ad24e74f5ea206d737bad4253f33504a542eaba':
[Navigation bar] Allow "right to left" gesture to launch search panel
2014-01-29 15:52:15 +00:00
John Spurlock
2ad24e74f5
am 15c09e1e: am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
...
* commit '15c09e1e2f55fbca9ddafa4227ef30a6dbefa664':
[Navigation bar] Allow "right to left" gesture to launch search panel
2014-01-29 15:49:20 +00:00
Narayan Kamath
1e7011fb29
Merge "Path.native_trim should return long, not int."
2014-01-29 15:48:11 +00:00
John Spurlock
15c09e1e2f
am 0dbcd7d9: am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
...
* commit '0dbcd7d99f37967f2ee7a8fad113df97b6a94fe7':
[Navigation bar] Allow "right to left" gesture to launch search panel
2014-01-29 15:46:30 +00:00
John Spurlock
0dbcd7d99f
am 2d35ba4d: am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
...
* commit '2d35ba4d4a43036706638ca0e96e5e1a9904d2af':
[Navigation bar] Allow "right to left" gesture to launch search panel
2014-01-29 15:42:34 +00:00
Narayan Kamath
9932d64883
am 1a6e29aa: am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."
...
* commit '1a6e29aae589073bfd6bd5f42816e622584cfb7a':
mNativeCanvas is long, not int.
2014-01-29 15:40:59 +00:00
John Spurlock
2d35ba4d4a
am d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
...
* commit 'd12f4eb8cb986d710aaf98a9d6b8f66803d182d6':
[Navigation bar] Allow "right to left" gesture to launch search panel
2014-01-29 07:40:00 -08:00
Narayan Kamath
1a6e29aae5
am d933edc7: am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."
...
* commit 'd933edc742dcaf96862b211f4641e4cfd98acef5':
mNativeCanvas is long, not int.
2014-01-29 15:38:42 +00:00
John Spurlock
d12f4eb8cb
Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
2014-01-29 15:36:40 +00:00
Narayan Kamath
d933edc742
am 9ecada44: am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."
...
* commit '9ecada44042c49516d781281bbe0cba4e0af51a2':
mNativeCanvas is long, not int.
2014-01-29 15:33:48 +00:00
Narayan Kamath
9ecada4404
am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."
...
* commit 'dfd4f5232c87c51fe639b594fd210b4073eca42b':
mNativeCanvas is long, not int.
2014-01-29 15:29:23 +00:00
Narayan Kamath
c2cf1e1df4
Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
2014-01-29 15:26:48 +00:00
Narayan Kamath
dfd4f5232c
am d228a038: Merge "mNativeCanvas is long, not int."
...
* commit 'd228a03891f60520d517b2a3bc900b008b2da702':
mNativeCanvas is long, not int.
2014-01-29 07:26:19 -08:00
Narayan Kamath
d228a03891
Merge "mNativeCanvas is long, not int."
2014-01-29 15:02:05 +00:00
Evan Charlton
33da8dde5f
Merge "Allow for a configurable WiFi restore bounce delay"
2014-01-29 14:58:29 +00:00
Narayan Kamath
11f66d0874
am 1caea796: am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
...
* commit '1caea796c9f3154048c02db6f46c458e8a80c32c':
AArch64: Use long for pointers in graphics/Interpolator
2014-01-29 12:50:20 +00:00
Narayan Kamath
c42de09a94
am 67ac8120: am 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
...
* commit '67ac8120bf4e01b1de9d46673142d7fb92615616':
AArch64: Use long for pointers in SurfaceTexture
2014-01-29 12:50:15 +00:00
Narayan Kamath
38885b63fc
am 38638b2f: am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
...
* commit '38638b2fcc4aba428889d521d83762d716e32332':
AArch64: Use long for pointers in DRM classes
2014-01-29 12:50:09 +00:00
Narayan Kamath
ef099b7183
am 4a587146: am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
...
* commit '4a58714606fdeb2e740b0ce51ea5074783e2ecf4':
AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 12:50:02 +00:00
Scott Main
0b4e9b674f
am 3e35a2c3: am 5a0b40d4: am f088add7: am 80cbc73f: am e535499e: Merge "add api notice to cast package index" into klp-docs
...
* commit '3e35a2c3b702777527da74e4672bddd1f593a1c9':
add api notice to cast package index
2014-01-29 12:49:51 +00:00
Scott Main
99fec5df7f
am 6fe01375: am d50aaefd: am 66c82a8a: am 28c42122: am c62223a0: add api notice to a bunch more files in iberico release
...
* commit '6fe01375532d11d4fd710b4d7c7d0899ed6f548e':
add api notice to a bunch more files in iberico release
2014-01-29 12:49:45 +00:00
Scott Main
ab3269ad4c
am 03cc03a3: am f81a02a3: am 9cc6eb7b: am da59b9c1: am e7249902: add warning to all the new iberico API pages about SDK not available yet
...
* commit '03cc03a32c0cfa5368903d389c102baa129c6da9':
add warning to all the new iberico API pages about SDK not available yet
2014-01-29 12:49:38 +00:00
quddusc
913d15460e
am 517b322f: am 299cd65e: am c73d1d4a: am c4cba0e9: am 32993c68: docs: Added API reference docs for GCore Iberico release.
...
* commit '517b322f091bdbfb8b82c0d57895f20b95fee6a3':
docs: Added API reference docs for GCore Iberico release.
2014-01-29 12:49:22 +00:00
Scott Main
be3056050d
am ee209289: am dd5b4cc9: am 3b9b40f7: am 31db1bba: am cf010ab9: add google cast feature page
...
* commit 'ee20928913889eace0388f348c09f1f801272fd6':
add google cast feature page
2014-01-29 12:49:15 +00:00
Narayan Kamath
1caea796c9
am c74f7619: am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
...
* commit 'c74f7619e19f4d172fc0bc6220abc917024c45b0':
AArch64: Use long for pointers in graphics/Interpolator
2014-01-29 12:23:45 +00:00
Narayan Kamath
67ac8120bf
am 0cc4bb1f: am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
...
* commit '0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2':
AArch64: Use long for pointers in SurfaceTexture
2014-01-29 12:23:40 +00:00
Narayan Kamath
e3a6663bb2
mNativeCanvas is long, not int.
...
swapNativeCanvas was asking for an int field.
Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
2014-01-29 12:21:32 +00:00
Narayan Kamath
c74f7619e1
am cdc095ae: am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
...
* commit 'cdc095ae4850d9ffd08de0d6e8828949603fcdd1':
AArch64: Use long for pointers in graphics/Interpolator
2014-01-29 12:21:21 +00:00
Narayan Kamath
0cc4bb1ff3
am e4fc5c17: am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
...
* commit 'e4fc5c17c092a77e0647e01e93a6b0e806c27692':
AArch64: Use long for pointers in SurfaceTexture
2014-01-29 12:21:11 +00:00
Scott Main
1406a2203f
am 92424e46: am 66b6ae35: am c510adb7: am 2d27da36: am 3781318f: add Cast to the sidenav
...
* commit '92424e46ef6247e78c31d0f3dc68b62c78d12117':
add Cast to the sidenav
2014-01-29 12:20:54 +00:00
Mark Salyzyn
97cae3eae6
am c0b540dc: am 8bb5e662: am d732f561: am 2c6b048b: am 967c5d00: Merge changes I3659193f,I8b78e4db
...
* commit 'c0b540dc8744eceabfcf09a45ec964cb9709027a':
jni: Resolve build warnings
jni: Incorporate liblog reading API
2014-01-29 12:20:15 +00:00
Narayan Kamath
cdc095ae48
am 7be33110: am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
...
* commit '7be33110ea3e1a032ee3aa7c50f1dedf52fcab25':
AArch64: Use long for pointers in graphics/Interpolator
2014-01-29 12:18:31 +00:00
Narayan Kamath
e4fc5c17c0
am 74db9ddb: am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
...
* commit '74db9ddb341d9d7dafe36b2bc74e3aaf50dd3160':
AArch64: Use long for pointers in SurfaceTexture
2014-01-29 12:18:27 +00:00
Narayan Kamath
7be33110ea
am d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
...
* commit 'd4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3':
AArch64: Use long for pointers in graphics/Interpolator
2014-01-29 04:14:48 -08:00
Narayan Kamath
74db9ddb34
am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
...
* commit '887b1ca87941095797a246b2d68ec2626a7cfc43':
AArch64: Use long for pointers in SurfaceTexture
2014-01-29 04:14:44 -08:00
Narayan Kamath
d4ccffd3ba
Merge "AArch64: Use long for pointers in graphics/Interpolator"
2014-01-29 12:12:27 +00:00
Narayan Kamath
887b1ca879
Merge "AArch64: Use long for pointers in SurfaceTexture"
2014-01-29 12:12:17 +00:00
Narayan Kamath
38638b2fcc
am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
...
* commit 'eaae990695df28f00432978c417f7c47752cd6aa':
AArch64: Use long for pointers in DRM classes
2014-01-29 12:12:14 +00:00
Narayan Kamath
eaae990695
am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
...
* commit '672f3ee33c3e3d76c4b6764fb1dca8c705c159e3':
AArch64: Use long for pointers in DRM classes
2014-01-29 12:08:57 +00:00
Narayan Kamath
672f3ee33c
am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
...
* commit '95ba1eb6243a9b356ec4ac02177076e2427360a3':
AArch64: Use long for pointers in DRM classes
2014-01-29 12:06:26 +00:00
Narayan Kamath
95ba1eb624
am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
...
* commit 'dd6de16aee254497040b32cc330b4637b96685c0':
AArch64: Use long for pointers in DRM classes
2014-01-29 04:03:16 -08:00
Narayan Kamath
dd6de16aee
Merge "AArch64: Use long for pointers in DRM classes"
2014-01-29 12:00:28 +00:00
Ashok Bhat
fbb35fb39e
AArch64: Use of long for pointers in PropertyValuesHolder
...
Long is used in PropertyValuesHolder class to store native pointers
as they can be 64-bit. Note that jmethodID, a pointer to structures,
is also carried in long rather than int to support 64-bit system.
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
(cherry picked from commit 0141e884344a5c267239079d615e1c9d9898a222)
Change-Id: I80408a7227427732db0d8b4c960bcb849b7c8060
2014-01-29 11:07:06 +00:00
Narayan Kamath
4a58714606
am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
...
* commit '09d07d0d33d44fc87c02a8f607ecb7b96dbb4145':
AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 10:54:26 +00:00
Narayan Kamath
09d07d0d33
am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compatible"
...
* commit 'e3e4b40577032f6fad38bfbeb9c2b40df89f0ef9':
AArch64: Make Binder and Parcel 64-bit compatible
2014-01-29 10:51:51 +00:00