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

122917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
eee015057a am 36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 
* commit '36d7dfb7e816836dbc6039237cadd3382e10d5b2':
  Revert "add api notice to a bunch more files in iberico release"
 2014-01-30 16:30:26 +00:00
Scott Main
f6617d0fa7 Revert "add api notice to cast package index" 
This reverts commit 845bcc6d344765a0ea7cfcf0b4ac398774d06f94.

Change-Id: I07b047f1b44e8b9b32bb4b36b6f858cdef9fed9e
 2014-01-30 16:28:27 +00:00
Scott Main
36d7dfb7e8 Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs 2014-01-30 16:26:21 +00:00
Scott Main
df2cb1e521 Revert "add api notice to a bunch more files in iberico release" 
This reverts commit c62223a04d15da4240129a9b05ad0be965f08ee4.

Change-Id: If3cee4062e2f48a3c1e365f025701e6d1de9c9d4
 2014-01-30 16:25:38 +00:00
Michael Jurka
2ac4f3b225 Merge "Don't set suggested wallpaper dimensions in default wallpaper cropper" 2014-01-30 14:34:56 +00:00
jl1990
3cd12a5155 Fixed cancel() not working correctly 
The method handleMessage(Message msg) from mHandler variable was
not checking if the timer was cancelled, so
sendMessageDelayed(obtainMessage(MSG), delay) was keeping the
timer alive. The patch simply adds a boolean and checks if the
CountDownTimer was cancelled before calling
sendMessageDelayed(obtainMessage(MSG), delay)

bug: https://code.google.com/p/android/issues/detail?id=58668

Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8
Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
 2014-01-30 13:46:44 +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
Narayan Kamath
70986e197b am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 
* commit 'ab71f8b68fee0f2a4f2049c4345b5334948c9df9':
  AArch64: Use of long for pointers in PropertyValuesHolder
 2014-01-30 02:39:21 -08:00
Narayan Kamath
ab71f8b68f Merge "AArch64: Use of long for pointers in PropertyValuesHolder" 2014-01-30 10:37:12 +00:00
Narayan Kamath
fa2e16e36d am 54190ec8: Merge "change Surface constructor arg to 64bit" 
* commit '54190ec8307ebb83d02b7d9b8edc80a042792de6':
  change Surface constructor arg to 64bit
 2014-01-30 02:34:38 -08:00
Narayan Kamath
54190ec830 Merge "change Surface constructor arg to 64bit" 2014-01-30 10:31:44 +00:00
Chong Zhang
b215529c72 change Surface constructor arg to 64bit 
Bug: 12799017
Bug: 12799384

(cherry picked from commit af608e81d450b962a443a21fb1a6feadeb355fe1)

Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
 2014-01-30 09:50:21 +00:00
Narayan Kamath
cb7cdd5053 am c65e0c95: Merge "Fix a few more delegate methods in layoutlib." 
* commit 'c65e0c95c855de4505a320b6dcd66df5397c88d5':
  Fix a few more delegate methods in layoutlib.
 2014-01-30 01:37:41 -08:00
Narayan Kamath
c65e0c95c8 Merge "Fix a few more delegate methods in layoutlib." 2014-01-30 09:13:17 +00:00
John Reck
a6260b83da Fix nano vs. millis 
Change-Id: I54f752bb7faab5fa66c36252c9f7cf8f5c9939c9
 2014-01-29 19:59:16 -08: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
Andy McFadden
314405bf89 Allow "opaque" flag to be updated 
Added a setOpaque() call and a bunch of comments.

Bug 12387406

Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
 2014-01-29 17:38:10 -08: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
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