40208 Commits

Author SHA1 Message Date
Dharmaray Kundargi
f7465eb652 am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb
* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
  videoeditor JNI files on honeycomb
2011-01-17 11:40:11 -08:00
Eric Laurent
20fd4c8b96 am 72b83b59: Merge "Fix issue 3354692." into honeycomb
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
  Fix issue 3354692.
2011-01-17 10:53:06 -08:00
Romain Guy
e99d5e6eb8 am cfe5dd01: Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb
* commit 'cfe5dd01f29acbb7393ffa91bb4b2a8ad43414f2':
  Yet another fix for 9patch rendering. Bug #3362133
2011-01-17 10:53:02 -08:00
Dharmaray Kundargi
4e4f3d1df4 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent
72b83b5938 Merge "Fix issue 3354692." into honeycomb 2011-01-17 10:51:46 -08:00
Romain Guy
cfe5dd01f2 Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycomb 2011-01-17 10:51:32 -08:00
Romain Guy
7444da5126 Yet another fix for 9patch rendering.
Bug #3362133

Change-Id: Ia6521d31a8c208a2ad2506a23b6a01e5e442ad86
2011-01-17 10:53:44 -08:00
Eric Laurent
117b7bb5b5 Fix issue 3354692.
The problem is that SoundPool never calls the onLoadComplete() callback
when load() method fails because the file cannot be opened.
AudioService loadSoundEffects() was blocked waiting for a callback
that never came.
In this particular case, this happened on a specific build where sound
effects assets were not included.

The fix consists in waiting for the callback only if at least one sample is
accepted by SoundPool load().

Also moved the initial loading of sound effect samples from the boot completed
broadcast receiver to the audio service message handler to avoid waiting in the
main system server thread.

Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
2011-01-17 10:36:12 -08:00
Kenny Root
7b5b79e4bc am ec7c9ff0: Hide USB mass storage APIs in StorageManager
* commit 'ec7c9ff0bb1c98cb8bec3ec7bdacbae3a434fa53':
  Hide USB mass storage APIs in StorageManager
2011-01-17 09:55:31 -08:00
Kenny Root
ec7c9ff0bb Hide USB mass storage APIs in StorageManager
They appear to have been unhidden in a bad merge from gingerbread.

Change-Id: Ice0fc865425d5d885af3c2e90a7ffeaa1d623b80
2011-01-17 09:15:36 -08:00
Shih-wei Liao
9dc76d53ed am 38f79d01: Merge "Make ImageProcessing work." into honeycomb
* commit '38f79d01db07f7cc3d3b49d594b675adfa8959d5':
  Make ImageProcessing work.
2011-01-17 01:20:42 -08:00
Shih-wei Liao
38f79d01db Merge "Make ImageProcessing work." into honeycomb 2011-01-17 01:18:32 -08:00
Shih-wei Liao
2aad562ab2 Make ImageProcessing work.
Change-Id: Id1ab91657ff4ba70a2391b168958e72b68e8a3e0
2011-01-17 01:17:39 -08:00
satok
d039293c17 am 5a1473ba: Merge "Implicitly/Explicitly subtypes bug." into honeycomb
* commit '5a1473bae0467693445b31454e4f736763276de8':
  Implicitly/Explicitly subtypes bug.
2011-01-16 23:50:06 -08:00
satok
5a1473bae0 Merge "Implicitly/Explicitly subtypes bug." into honeycomb 2011-01-16 23:48:24 -08:00
satok
f6cafb6375 Implicitly/Explicitly subtypes bug.
Change-Id: I6ccc22d4272ee92c0d8ba3f3c724d8f838d51310
2011-01-17 16:29:02 +09:00
Adam Powell
4ba7f35e0f am 92cd4d02: Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist." into honeycomb
* commit '92cd4d0296cc8936fcccd97cdbc7a13b724efab4':
  Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_OVERLAY to coexist.
2011-01-16 20:00:17 -08:00
Adam Powell
92cd4d0296 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
Adam Powell
8f68f4fe79 Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and
FEATURE_ACTION_MODE_OVERLAY to coexist.

Fix "custom title" dialog window decor for holo.

Change-Id: Ia732caeb89e12d8d754be31c3bd2faf13a8c95d6
2011-01-16 19:55:21 -08:00
Adam Cohen
0a654ae398 am d110889c: Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
* commit 'd110889cbca4d40f8cdeddfe6eb2f498f470ae4b':
  Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
2011-01-16 19:48:02 -08:00
Adam Cohen
d110889cbc Fixing bug related to collisions with AppWidget view ids and AppWidgetHost view ids
Change-Id: I2512b83078cff6c4d444c95275625ff39466ac83
2011-01-16 19:46:15 -08:00
Xavier Ducrohet
bca118f027 am 87ab45c0: Merge "LayoutLib: extract resource resolution into its own class." into honeycomb
* commit '87ab45c0fe4db814a7364fce3b88be3a49507e90':
  LayoutLib: extract resource resolution into its own class.
2011-01-16 19:40:42 -08:00
Xavier Ducrohet
87ab45c0fe Merge "LayoutLib: extract resource resolution into its own class." into honeycomb 2011-01-16 19:38:33 -08:00
Jim Miller
f0c53e6699 am bdac9e0f: Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb
* commit 'bdac9e0fbe874cf7414228624bd0d3af4f715ccc':
  Fix 3005526: Properly update StatusView from Password/PIN unlock
2011-01-16 19:28:25 -08:00
David 'Digit' Turner
5356487f8b am 3612f087: Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb
* commit '3612f0870c4252a60b93332eadde780dc122a05b':
  SystemServer: Do not register null BlueTooth service in the emulator
2011-01-16 19:26:22 -08:00
Jim Miller
bdac9e0fbe Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into honeycomb 2011-01-16 19:25:45 -08:00
David 'Digit' Turner
3612f0870c Merge "SystemServer: Do not register null BlueTooth service in the emulator" into honeycomb 2011-01-16 19:25:01 -08:00
Jeff Brown
fed9d654e9 am 5cdf0752: Merge "Support non-rectangular input regions." into honeycomb
* commit '5cdf07524132722e0db69db1ca8dcaf3f0073265':
  Support non-rectangular input regions.
2011-01-16 19:24:17 -08:00
Jeff Brown
5cdf075241 Merge "Support non-rectangular input regions." into honeycomb 2011-01-16 19:22:01 -08:00
Dharmaray Kundargi
cd196d3727 videoeditor JNI files on honeycomb
Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
2011-01-16 19:19:07 -08:00
Jim Miller
305093f911 Fix 3005526: Properly update StatusView from Password/PIN unlock
This uses the newly added setHelpMessage() to properly show PIN and
password help in StatusView.

Change-Id: I8662e179e989c6e72f657c81f23b1b2fa7982727
2011-01-16 19:09:15 -08:00
Jeff Brown
fbf0977321 Support non-rectangular input regions.
This enables the system bar to carve out a region through which
events will be sent to the IME behind it.

Bug: 3238092
Change-Id: I69b855a8d9b5b3ee525266c0861826e53e5b5028
2011-01-16 18:58:49 -08:00
Dianne Hackborn
e27145d83f am 805fd7ee: Add API to get path to OBBs.
* commit '805fd7ee0e5dc2939e85c84f78d9890a51982bc0':
  Add API to get path to OBBs.
2011-01-16 18:47:55 -08:00
Dianne Hackborn
805fd7ee0e Add API to get path to OBBs.
Also hide the bitmap thumbnail stuff, we can't support it in its
current form.

And fix some bugs with propagating paths to native code.  Yikes!

Change-Id: I13ab37ddbdba5c073489cba5eab035117d3c1574
2011-01-16 18:43:04 -08:00
Jamie Gennis
d97ea28b48 am cf18c478: Merge "Implement SurfaceTexture frame-available callback." into honeycomb
* commit 'cf18c4788af740773c9b2720a1c4ed5f45454b8e':
  Implement SurfaceTexture frame-available callback.
2011-01-16 18:17:34 -08:00
Jamie Gennis
cf18c4788a Merge "Implement SurfaceTexture frame-available callback." into honeycomb 2011-01-16 18:15:36 -08:00
Jamie Gennis
ecd797b12f am 41424ade: Merge "Fix SurfaceTexture transform matrix." into honeycomb
* commit '41424adec8382af9064baf1d8bde29d7349a6155':
  Fix SurfaceTexture transform matrix.
2011-01-16 18:15:32 -08:00
Mathias Agopian
4f22f981fd am 84d36f0a: Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb
* commit '84d36f0a382d79f00fdd896f955a579bf9e160d9':
  egl: fix GetProcAddress for EGLimage extensions
2011-01-16 18:15:29 -08:00
Jamie Gennis
41424adec8 Merge "Fix SurfaceTexture transform matrix." into honeycomb 2011-01-16 18:14:07 -08:00
Mathias Agopian
84d36f0a38 Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycomb 2011-01-16 18:13:19 -08:00
Michael I. Gold
f4a43837f9 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
82fcc21683 am f90633a0: Merge "egl: expose EGLimage extensions" into honeycomb
* commit 'f90633a07edf2ed058c054ec4cb82d7d1b3a8666':
  egl: expose EGLimage extensions
2011-01-16 18:05:32 -08:00
Mathias Agopian
f90633a07e Merge "egl: expose EGLimage extensions" into honeycomb 2011-01-16 18:03:55 -08:00
Michael I. Gold
3ece010a4b 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
a55c1280f9 am 057d9f16: Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb
* commit '057d9f16f793c3796751913ad2eeb12582a7626b':
  Fix 3342063: Correctly update StatusView when battery changes.
2011-01-16 17:52:39 -08:00
Jim Miller
057d9f16f7 Merge "Fix 3342063: Correctly update StatusView when battery changes." into honeycomb 2011-01-16 17:51:04 -08:00
Jason Sams
58d1070861 am 7f13a850: Merge "Add some error checking." into honeycomb
* commit '7f13a850ddb420015d953492b093c762a4ec3050':
  Add some error checking.
2011-01-16 17:48:41 -08:00
Jason Sams
7f13a850dd Merge "Add some error checking." into honeycomb 2011-01-16 17:46:16 -08:00
Jim Miller
fc5001a592 Fix 3342063: Correctly update StatusView when battery changes.
LockScreen wasn't correctly updating StatusView when the battery
status changed.  In addition, the messages aren't supposed to
"pop" when changed, so changed visibility state from GONE to INVISIBLE
when not in use.

Change-Id: Icacbf7e2275c77a28e7e0a9d1247abdbebadcd4f
2011-01-16 17:45:46 -08:00
Adam Cohen
dc0b8323d4 am 50204584: Fixing StackView bug (Issue: 3321912)
* commit '502045849f760f018f662d752020aef32d4cecd9':
  Fixing StackView bug (Issue: 3321912)
2011-01-16 17:41:38 -08:00