Marco Nelissen
3e5fd52205
Resolve conflicts for commit '3ce65633'
...
Change-Id: I7ad67f68ce30a9fc4492f8291eded28d19aa65dd
2010-08-05 11:23:14 -07:00
Kenny Root
ce845d7301
am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread
...
Merge commit 'c5183acae55e08f4bfcb58aa122a200863748a63'
* commit 'c5183acae55e08f4bfcb58aa122a200863748a63':
Only allow one movePackage operation in-flight
2010-08-05 10:47:15 -07:00
Alex Sakhartchouk
518f033b68
Adding more matrix math functions.
...
Fixing build.
Change-Id: Ie0f6724ba063ada94d1d44d99bbe56e21d9bd72f
2010-08-05 10:28:43 -07:00
Jason Sams
442a647424
Support constant and varying colors in ProgramFragment.
...
Change-Id: I16ce84ff427016f3a1923594efc718eca32dd7f2
2010-08-05 10:00:21 -07:00
Robert Greenwalt
208c425e84
Merge "Fix runtime reset (missing case break)."
2010-08-05 08:17:09 -07:00
Daniel Sandler
0f0b11c871
Basic support for notification payloads in the panel.
...
Line-item veto is there, but allows you to cancel some
notifications you probably shouldn't be canceling. (Should
hide the "X" in those cases.)
No preference given to "sticky" notifications, because
there's no such thing yet.
Notifications are now limited to 4 visible icons, per spec.
The implementation is a total hack for now.
Change-Id: Ibdf433ae94189117f983c510fe5e0cff0bf5c44c
2010-08-05 09:34:50 -04:00
Eric Laurent
4e68d506b0
resolved conflicts for merge of acc4e683 to master
...
Change-Id: Iabfdbdd1f048bd1a3f5cf90bfba8a33f5a0d27f8
2010-08-05 02:53:22 -07:00
Daniel Sandler
1a655771ef
Fix runtime reset (missing case break).
...
Bug: 2895437
Change-Id: If061c02811144031833f75ad47ae313e2208701c
2010-08-04 23:57:00 -04:00
Oscar Montemayor
e728ca93fd
Updated API after unhinding a hidden element.
...
Change-Id: Ie76702bf0bf161f6ebb5a48db7d4ac89364ebafb
2010-08-04 19:56:48 -07:00
Oscar Montemayor
8063589c6c
Removed extra parameter tag in JavaDocs
...
Change-Id: I0bc6f201d12a95a7c96b3fac90688d113a554d22
2010-08-04 18:34:12 -07:00
Oscar Montemayor
f7c851749d
Merge "Fix for SDK breakage with hidden field."
2010-08-04 18:28:43 -07:00
Oscar Montemayor
ac54fb9da1
Fix for SDK breakage with hidden field.
...
Change-Id: If66c31b8823a886e9a0853b63ef9bbdf25dc9a71
2010-08-04 18:24:14 -07:00
Vasu Nori
b6d1437f32
fix build breakage
...
eclipse doesn't complain but our build does..
Change-Id: If0289b68e91e7eb2ae7a9b7bd90d5cb6b728e944
2010-08-04 18:05:00 -07:00
Adam Powell
8e552630e7
Let action modes overlay window content
...
Change-Id: Ic0512c3e6338e1de15facec0a6650f9da9808a24
2010-08-04 17:42:44 -07:00
Oscar Montemayor
2cd1dbe50d
Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists."
2010-08-04 17:15:25 -07:00
Manuel Roman
96183e16e4
Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown"
2010-08-04 16:42:55 -07:00
Oscar Montemayor
c4c9df3d71
Merge "Device Policy Manager changes to enable Global Proxy."
2010-08-04 16:25:01 -07:00
Irfan Sheriff
8525f5dc4a
Merge "Avoid hostname lookup in NetworkProperties"
2010-08-04 16:07:13 -07:00
Oscar Montemayor
b8f66019ad
Fix for bug 2890320 Browser crashes, after adding bookmark.
...
Fixed Proxy class locking and dealing with empty exclusion lists.
Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
2010-08-04 16:07:02 -07:00
Oscar Montemayor
69238c6a37
Device Policy Manager changes to enable Global Proxy.
...
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
2010-08-04 16:01:56 -07:00
Xia Wang
a69fbc8eff
Switch to new enum definition in RilCmds
...
Change-Id: Id6173d92a1c8d136b037448e2df55ea9ef49d34e
2010-08-04 15:39:24 -07:00
Romain Guy
42d530f18a
Merge "Fix native crash in SkiaShader."
2010-08-04 15:35:10 -07:00
Romain Guy
6c07daf86c
Fix native crash in SkiaShader.
...
Bug #2893733
Change-Id: I7feb9ab113fe0012cf9eb271f2b044f12a5c9c4e
2010-08-04 15:35:18 -07:00
Irfan Sheriff
1cf56ab9c6
Avoid hostname lookup in NetworkProperties
...
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
2010-08-04 15:15:49 -07:00
Alex Sakhartchouk
f61f33dd38
Merge "Added ability to set font color. Propagating the name of meshes and allocations from native a3d to java"
2010-08-04 14:48:26 -07:00
Alex Sakhartchouk
fb10c16a05
Added ability to set font color.
...
Propagating the name of meshes and allocations from native a3d to java
Change-Id: If781f55340b5369459610e5e92ea69e240dcd24e
2010-08-04 14:45:48 -07:00
Nipun Kwatra
a8bd3a303e
Merge "Adding parseSizesList, getSupportedPreviewSizes to CameraParameters."
2010-08-04 14:23:54 -07:00
Brad Fitzpatrick
85d21bc6e1
am 9ee17b7d: am 866362fc: Merge "Usage Stats: don\'t block writing stats to disk." into gingerbread
...
Merge commit '9ee17b7dec7c76830b5add29f3b97039e178629a'
* commit '9ee17b7dec7c76830b5add29f3b97039e178629a':
Usage Stats: don't block writing stats to disk.
2010-08-04 14:07:55 -07:00
Nipun Kwatra
b70c1db70f
Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.
...
Moved functionality to parse string of sizes from getSupportedPictureSizes
to parseSizesList.
Added getSupportedPreviewSizes which returns a list of supported preview sizes.
Change-Id: I435317427c1ee9623caef435f93e95d4476b7285
2010-08-04 14:04:07 -07:00
Chet Haase
bb688d6f37
Merge "Fix NPE in onAnimationEnd when using Sequencer.after(long)"
2010-08-04 13:58:52 -07:00
Patrick Dubroy
40771bc433
Fix NPE in onAnimationEnd when using Sequencer.after(long)
2010-08-04 13:49:39 -07:00
Jeff Hamilton
397e3a7bf7
Merge "Improve the documentation for the browser provider, and a few small cleanups."
2010-08-04 13:44:17 -07:00
Scott Main
53adc3c296
Merge "add droiddoc flag for honeycomb apis (for reference filtering)"
2010-08-04 13:35:39 -07:00
Vasu Nori
0c9e14aa4a
add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown
...
Change-Id: I3dd69b6907d68b7c1184139f22297ab92337f043
2010-08-04 13:34:34 -07:00
Jeff Hamilton
31d95db2cc
Improve the documentation for the browser provider, and a few small cleanups.
...
Change-Id: If6eb918ce4cdb09f74bd7eaaedf265d7981365ee
2010-08-04 15:26:25 -05:00
Daniel Sandler
b64ffdf0aa
Merge "Cleaning up the notification data structures."
2010-08-04 13:12:15 -07:00
Mike Lockwood
c3cc7011c2
Merge changes I085cb3cf,Ied1cddc6
...
* changes:
MTP: Add support for syncing MTP playlists
MTP: Fix some thread safety issues in MTP server start/stop sequence.
2010-08-04 13:02:06 -07:00
Vasu Nori
a7dd5eab33
requery() return value should be checked
...
if not checked and if the cursor continues to be used, it will result in
bug:2529736
Change-Id: I920f665643561374c2211acded6cc31fa8931909
2010-08-04 12:54:48 -07:00
Brett Chabot
f71925c84f
Merge "resolved conflicts for merge of 10928c37 to master"
2010-08-04 12:04:54 -07:00
Brett Chabot
f22e876393
resolved conflicts for merge of 10928c37 to master
...
Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351
2010-08-04 12:03:46 -07:00
Chet Haase
df030d2c16
View x/y properties now feed into matrix translation
...
Change-Id: I35d8953ab6c7a511cdf90f3f94a4a1b5ef549fc3
2010-08-04 12:01:51 -07:00
Nipun Kwatra
bf3699a558
Unhide MediaRecorder::setTimeLapseParameters()
...
This function is used to enable time lapse video capture
and set the related parameters.
Change-Id: Ib6c4c107a92942d8e8fcce935d2c8542f8006cfb
2010-08-04 11:17:49 -07:00
James Dong
13f5b25c62
am d152c1c7: am d194f3d6: Merge "Replace CHECK with a failure return value when mCamera->setParameters() fails if the camera is locked by someone else." into gingerbread
...
Merge commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb'
* commit 'd152c1c7534a80b84f6b389efa8a410ea359b3eb':
Replace CHECK with a failure return value when mCamera->setParameters() fails
2010-08-04 11:12:40 -07:00
Chris Tate
5bac1cc0b8
am 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread
...
Merge commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4'
* commit '9f6b16a29b62f29496bc652cfec7d6fe9f08c7f4':
Enhanced VelocityTracker for > 5 pointers and fixed bugs.
2010-08-04 11:12:32 -07:00
Mathias Agopian
5fd174c99b
am d12a98e2: am 9abce39a: Merge "fix [2421247] implement eglGetProcAddress(), needed in the ndk" into gingerbread
...
Merge commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb'
* commit 'd12a98e2b1eb3a2ae20eace8a7d4b5fa13bbedfb':
fix [2421247] implement eglGetProcAddress(), needed in the ndk
2010-08-04 11:12:25 -07:00
Konstantin Lopyrev
bf0d12c2e2
am 77c444dd: am 6fcf3a51: Merge "Improving profiling of views." into gingerbread
...
Merge commit '77c444dd2bdc9bb2d54fc58420d263a83018190c'
* commit '77c444dd2bdc9bb2d54fc58420d263a83018190c':
Improving profiling of views.
2010-08-04 11:12:19 -07:00
Konstantin Lopyrev
2bf8028a23
am b59b1209: am 321f7fad: Making sure that there is no notification when focus changes from something to nothing.
...
Merge commit 'b59b120929f10c1501d27ebab2f69180868e9776'
* commit 'b59b120929f10c1501d27ebab2f69180868e9776':
Making sure that there is no notification when focus changes from something to nothing.
2010-08-04 11:12:13 -07:00
James Dong
26d7a6df73
am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread
...
Merge commit '246aad12cf2becda5111d03fd1dd8f39712686f2'
* commit '246aad12cf2becda5111d03fd1dd8f39712686f2':
File writer has a designated writer thread now
2010-08-04 11:12:03 -07:00
James Dong
327c0bd9e2
am 9b84e8df: am a788026f: Merge "Fixed a typo in a method name of MediaPlayerPerformance.java class" into gingerbread
...
Merge commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80'
* commit '9b84e8df41261abeec7e37bff5f1b0cbf1fbce80':
Fixed a typo in a method name of MediaPlayerPerformance.java class
2010-08-04 11:11:50 -07:00
Adam Powell
4be0d52125
Added android.widget.PopupMenu
...
Change-Id: Id507cf93ebd0484f141a0a44266b883c01aa10db
2010-08-04 11:06:22 -07:00