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

122790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Jurka
2ac4f3b225 Merge "Don't set suggested wallpaper dimensions in default wallpaper cropper" 2014-01-30 14:34:56 +00:00
Przemyslaw Szczepaniak
8399aae0a0 Add public SynthesisRequestV2 constructor. 
While implementing the new TTS API, I found out that it's very difficult
to create an SynthesisRequestV2 instance for testing purposes - it's
a final class, with no publicly visible constructors.

Bug: 8259486
Change-Id: I88b84fd8ad1ac6960f3932863ca758657f9547ff
 2014-01-30 13:27:00 +00:00
Przemyslaw Szczepaniak
1ca1d88658 Allow clients to extend the TTS UtteranceId class. 
This change allows TTS clients to create (and use) classes derived from the
UtteranceId class. This allows to attach a custom data and methods that
can be reached later in callbacks that take the UtteranceId instance as
parameter.

Also, since we can't depend on the identityHashCode results being unique,
this change adds AtomicInteger to generate unique identifiers for UtteranceId
instances.

Bug: 8259486
Change-Id: Id1e9eabc890ec585a7f8570fd20e287dcda9a11d
 2014-01-30 10:41:26 +00:00
Deepanshu Gupta
34b16b854a Fix build 
Change-Id: Ifcbf44bc310daee4410ccc6ddf6bdc44565e20da
 2014-01-29 19:14:21 -08:00
Deepanshu Gupta
651f5e0e60 Merge "Fix native method signatures" 2014-01-30 02:47:53 +00:00
Deepanshu Gupta
9731f5796c Merge "Manual merge of changes from klp-dev" 2014-01-30 02:47:17 +00:00
Adam Koch
268d7ad329 am 310b1e51: am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit '310b1e511f92c6972ccda2c7a779116fc0f89ced':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-30 01:58:22 +00:00
Deepanshu Gupta
e05bb956ce Fix native method signatures 
Some new methods have been added which are yet to be implemented.

Change-Id: Ie5a0657c7ccbe95200c270d5c15b516a385b083b
 2014-01-29 17:14:40 -08:00
Deepanshu Gupta
bd28e2d9d3 Manual merge of changes from klp-dev 
Manually merged the following changes from klp-dev branch and fixed
merge conflicts:
78cfdf31b7c48589ea3a148ec1d6d573235bc06b
d0581d271e814670d81a6550aa7b1e86864d5710
1f92d7fc0ffa72d7db93244c29a1a6575bb4b318
0baec410c29206dc72d9f5afba5d45827e62c00c
24541255c312ee34f9bf17eb5852cdffd4807065

Change-Id: I426729bb90a26746bfff3a0e4a03ea9f37972528
 2014-01-29 16:50:40 -08:00
ztenghui
f3560a133e Merge "Merge close vertices in a better way." 2014-01-29 23:45:12 +00:00
Chris Craik
f5b5482dca Merge "Fix build breakage" 2014-01-29 23:32:52 +00:00
Chris Craik
0e7eb954f1 Fix build breakage 
Change-Id: I65ab3cb691935db23b7a1f600e421fb5d8e850cd
 2014-01-29 15:30:50 -08:00
Adam Koch
310b1e511f am af5b2d3f: am 6e1ce75f: am b430d93b: am cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659" into klp-docs 
* commit 'af5b2d3f2308296a7dec93e4f790fb587cd86197':
  Doc fix: Update code snippet in displaying bitmaps training class Bug: 12715659
 2014-01-29 23:15:16 +00:00
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
Dan Sandler
4d67c3a070 Merge "Fix NPE in empty SizeAdaptiveLayouts." 2014-01-29 17:26:32 +00: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
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