drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,041 Commits 1 Branch 0 Tags
Commit Graph

123041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Koch
af5b2d3f23 am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit '6e1ce75f4c45e91cdc4442cc6c3d823017c7de4d':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-29 23:12:52 +00:00
Adam Koch
6e1ce75f4c am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit 'b430d93b058a706be731e45f8c1836d97219a666':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-29 23:09:58 +00:00
Adam Koch
b430d93b05 am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit 'cb3ea3d47449a669e0d28131cf9254d5476bae73':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-29 23:06:46 +00:00
Adam Koch
cb3ea3d474 Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 2014-01-29 23:04:05 +00:00
Chris Craik
de439dbe2c Merge "Update reordering method names, and make 3d reordering API public" 2014-01-29 22:51:29 +00:00
Chris Craik
6657a6c539 Update reordering method names, and make 3d reordering API public 
IsContainedVolume -> hasIsolatedZVolume conveys that this affects Z
ordering of views

ProjectToContainedBackground -> ProjectBackwards, since it ended up
using its own projection target, separate from the 3d volume bit

Change-Id: Ia2cde838cc4da134366fe6ff623290fbd65e50c3
 2014-01-29 13:55:39 -08:00
Christopher Tate
5e31fdbacd Merge "Adapt to underlying changes in the PBKDF2 implementation" 2014-01-29 21:42:58 +00:00
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
Nick Kralevich
3dfa15c49b am db3278ab: Merge "Map SELinux log levels to Android log levels." 
* commit 'db3278ab429860161e5baa26f141de95a48de0cb':
  Map SELinux log levels to Android log levels.
 2014-01-29 10:03:53 -08:00
Nick Kralevich
db3278ab42 Merge "Map SELinux log levels to Android log levels." 2014-01-29 18:00:36 +00:00
Stephen Smalley
e0dda3c8e2 Map SELinux log levels to Android log levels. 
Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-01-29 12:55:58 -05:00
Baligh Uddin
3f0d0f7865 Import translations. DO NOT MERGE 
Change-Id: I618528f0600b0db1b94e6519e2ade0be411f7859
Auto-generated-cl: translation import
 2014-01-29 09:55:35 -08:00
Baligh Uddin
70fb94dc29 Import translations. DO NOT MERGE 
Change-Id: Ie2b2c6832f97ba8999fe3e78b0ffd310eae4448b
Auto-generated-cl: translation import
 2014-01-29 09:46:33 -08:00
Dan Sandler
4d67c3a070 Merge "Fix NPE in empty SizeAdaptiveLayouts." 2014-01-29 17:26:32 +00:00
Baligh Uddin
906b31986e Import translations. DO NOT MERGE 
Change-Id: I7df04f98f87ec79edd4ad1d950d9fcee0b42fc8b
Auto-generated-cl: translation import
 2014-01-29 09:22:40 -08:00
ztenghui
f5ca8b4cb1 Merge close vertices in a better way. 
And add more verification code for testing purpose.

Change-Id: I5bc4f69e6582c02fd03106af9a98abd05a6755b7
 2014-01-29 09:04:04 -08: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
40582000e0 Fix a few more delegate methods in layoutlib. 
Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848
 2014-01-29 15:05:03 +00: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
Michael Jurka
01f7cc17c8 Don't set suggested wallpaper dimensions in default wallpaper cropper 
suggestWallpaperDimensions is deprecated/ignored now anyway

Bug: 12118434
 2014-01-29 15:04:59 +01: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