Commit Graph

26139 Commits

Author SHA1 Message Date
Eric Laurent 7d95b378e0 Merge "Fix omission in NOTICE file." into honeycomb 2011-01-17 13:29:45 -08:00
Adam Powell 6f9a7a56ba Merge "Fix bug 3362446 - NPE in legacy menus" into honeycomb 2011-01-17 13:26:50 -08:00
David 'Digit' Turner 97c5ce8fa8 Merge "UsbService: Remove stack-trace message during boot." into honeycomb 2011-01-17 13:24:26 -08:00
Romain Guy 98fdf0c297 Merge "Don't break the build... update to 11.xml." into honeycomb 2011-01-17 13:07:24 -08:00
Romain Guy 4524504f3a Merge "Add BitmapFactory.Options.inMutable to load mutable bitmaps." into honeycomb 2011-01-17 13:03:16 -08:00
Kenny Root 0f89c33a67 Merge "Revert "Add the {get,set}PackageObbPaths calls to API"" into honeycomb 2011-01-17 13:02:48 -08:00
Andy Stadler 5721b3acc3 Merge "Add internal plumbing to DPM for encryption" into honeycomb 2011-01-17 12:52:41 -08:00
Svetoslav Ganov 3e24015871 Merge "Catching some edge cases while flinging/scrolling in NumberPicker" into honeycomb 2011-01-17 12:52:18 -08:00
Eric Laurent 25aefe9ad7 Fix omission in NOTICE file.
Added copyright notice for audio effects source files under
media/libeffects/lvm.

Change-Id: I5ac961000f7bbbfa1f95523712d8517844b1e5f9
2011-01-17 12:50:15 -08:00
Dianne Hackborn 66217a7e5b Merge "Start renaming FragmentTransaction.openTransaction() to beginTransaction()." into honeycomb 2011-01-17 12:33:50 -08:00
Adam Powell a0e8e5a5fa Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb 2011-01-17 12:07:52 -08:00
Scott Main 220cbd5a07 Merge "docs: update fragment docs with revised APIs, add sample code from ApiDemos, and polish it up" into honeycomb 2011-01-17 12:05:15 -08:00
Kenny Root 2eb165455e Merge "Add OBB size to PackageStats" into honeycomb 2011-01-17 11:58:02 -08:00
Romain Guy fa5b198ce8 Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb 2011-01-17 11:35:55 -08:00
Svetoslav Ganov a66e459da3 Merge "Ensure that no callback is invoked while initializing DatePicker" into honeycomb 2011-01-17 11:32:29 -08:00
Amith Yamasani 5b48d46ae8 Merge "Add back legacy layout for preference framework for compatibility." into honeycomb 2011-01-17 11:27:40 -08:00
Jeff Hamilton 127b4d6464 Merge "Delivering null cursor to loader callbacks." into honeycomb 2011-01-17 11:03:40 -08:00
Dharmaray Kundargi abf0a99b5b Merge "Video editor API update - rework for Patch Set 3" into honeycomb 2011-01-17 10:52:29 -08:00
Dharmaray Kundargi f47c93b79c Merge "integrate videoeditor preview player." into honeycomb 2011-01-17 10:52:23 -08:00
Dharmaray Kundargi 6449492fb2 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent 6bb959d8ba Merge "Fix issue 3354692." into honeycomb 2011-01-17 10:51:46 -08:00
Romain Guy c6199a29ff Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb 2011-01-17 10:51:32 -08:00
Shih-wei Liao 8cb90181ba Merge "Make ImageProcessing work." into honeycomb 2011-01-17 01:18:32 -08:00
satok ada6606f5e Merge "Implicitly/Explicitly subtypes bug." into honeycomb 2011-01-16 23:48:24 -08:00
Adam Powell 6deb6ba9a5 Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb 2011-01-16 19:58:51 -08:00
Xavier Ducrohet 38952f39f8 Merge "LayoutLib: extract resource resolution into its own class." into honeycomb 2011-01-16 19:38:33 -08:00
Jim Miller 6b2336a486 Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb 2011-01-16 19:25:45 -08:00
David 'Digit' Turner 1b3a60949a Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb 2011-01-16 19:25:01 -08:00
Jeff Brown 3175ea45e3 Merge "Support non-rectangular input regions." into honeycomb 2011-01-16 19:22:01 -08:00
Jamie Gennis 5b6e1d61e6 Merge "Implement SurfaceTexture frame-available callback." into honeycomb 2011-01-16 18:15:36 -08:00
Jamie Gennis db088f67b5 Merge "Fix SurfaceTexture transform matrix." into honeycomb 2011-01-16 18:14:07 -08:00
Mathias Agopian e41ae626be Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb 2011-01-16 18:13:19 -08:00
Michael I. Gold 609bb4dbf0 egl: fix GetProcAddress for EGLimage extensions
Return wrappers from GetProcAddress for glEGLImageTargetTexture2DOES
and glEGLImageTargetRenderbufferStorageOES which unwrap the EGLimage
handle before calling through to the implementation.

Change-Id: I2f5b180ab3ccdb28a4f510a2bd8c2eee941a84df
2011-01-16 18:12:04 -08:00
Mathias Agopian 237827387d Merge "egl: expose EGLimage extensions" into honeycomb 2011-01-16 18:03:55 -08:00
Michael I. Gold ca41e36266 egl: expose EGLimage extensions
Add EGL_KHR_gl_texture_cubemap_image and EGL_KHR_gl_renderbuffer_image
to the static EGL extension string since these require no new APIs
beyond what is already required.

Change-Id: I2d1fde86b19bb9eee46b3b977f51784a17cfcc3c
2011-01-16 18:02:52 -08:00
Jim Miller de5527d919 Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb 2011-01-16 17:51:04 -08:00
Jason Sams 3f5c218022 Merge "Add some error checking." into honeycomb 2011-01-16 17:46:16 -08:00
Jeff Brown 3b86887421 Merge "Flush Binder commands in ndk looper." into honeycomb 2011-01-16 17:37:34 -08:00
Jamie Gennis c4d4aeab52 Implement SurfaceTexture frame-available callback.
This change implements the onFrameAvailable callback for the
SurfaceTexture java class.  It includes the C++ SurfaceTexture code as
well as the JNI and Java code to enable the callback.

Change-Id: Ifd8b8e7ad46ee70cba6da1c2e96dab8045d1ea30
2011-01-16 17:28:39 -08:00
Patrick Dubroy 718365bdc3 Merge "Add a method for clearing all animations on a thread." into honeycomb 2011-01-16 17:28:11 -08:00
Adam Powell a8391d313b Merge "Fix bug 3050138 - Action bar does not display correctly when many action items are added" into honeycomb 2011-01-16 17:28:05 -08:00
Mathias Agopian 685387e7ab Merge "Add logs when taking a screenshot to help tracking issue 3361121" into honeycomb 2011-01-16 17:26:30 -08:00
Mathias Agopian c1d1b0d9b7 Add logs when taking a screenshot to help tracking issue 3361121
Change-Id: I61d1e072ebe7061ee1d7255f6121b684e2923d1b
2011-01-16 17:25:26 -08:00
Adam Cohen 60534afc2b Merge "Fixing StackView bugs:" into honeycomb 2011-01-16 17:08:40 -08:00
Joe Onorato 62298eb671 Merge "Remove a bunch of logging." into honeycomb 2011-01-16 17:01:14 -08:00
Kenny Root 36177e46d9 Merge "Put externalSize measurements in PackageStats" into honeycomb 2011-01-16 16:56:44 -08:00
Dharmaray Kundargi b6783164e8 integrate videoeditor preview player.
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
2011-01-16 16:43:20 -08:00
Jamie Gennis a214c64d7f Fix SurfaceTexture transform matrix.
Change-Id: I31520c547cafa5cc85cd0f73883ab3a9ff4648e2
2011-01-16 16:35:01 -08:00
Jason Sams 52c442d37a Merge "unhide functions used by reflected files for SDK." into honeycomb 2011-01-16 16:08:41 -08:00
Jim Miller e36d196890 Merge "Fix 3355957: Don't hide the keyboard for PIN/Password" into honeycomb 2011-01-16 16:06:51 -08:00