Commit Graph

39374 Commits

Author SHA1 Message Date
Christopher Tate
210383b0bd Merge "Gracefully handle "needs init" transport errors at finish" 2011-10-10 17:27:05 -07:00
Justin Ho
8e921010aa Resolved conflicts for merge of 83cf0313 to master
Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344
2011-10-10 16:46:35 -07:00
Amith Yamasani
0d8566b8f2 Merge "Don't show icon for power-off confirmation dialog." 2011-10-10 16:34:34 -07:00
Hiroshi Lockheimer
0c52d89601 Merge "Ensuring previous sounds are named correctly Bug: 5416299" into ics-factoryrom 2011-10-10 16:34:23 -07:00
Jim Miller
73022e39c5 Merge "Fix 5406921: Register for receiving phone state changes when KGSVM gets created." 2011-10-10 16:30:06 -07:00
Steven Ross
fedc5e3b9a Merge "Fixes 5429869 Only displaying FaceUnlock when window is focused" 2011-10-10 16:28:36 -07:00
Dianne Hackborn
816499ecb8 Merge "Fix issue #5405788: Device continuously opening and closing..." 2011-10-10 16:08:05 -07:00
Svetoslav Ganov
e10c53dcc4 Merge "Accessibility text changed event text not populated." 2011-10-10 16:05:53 -07:00
The Android Open Source Project
82cfb9dd6d Reconcile with ics-factoryrom-release
Change-Id: I8642724549283dbcd3d104a35d5c659e5591682e
2011-10-10 15:39:42 -07:00
Romain Guy
41461c5052 Merge "Don't call saveLayer() when it's not required Bug #5435653" 2011-10-10 15:24:06 -07:00
James Dong
25be28ec4f Merge "Support AMR as a file type so that it can be imported into movie studio" 2011-10-10 15:22:04 -07:00
Gilles Debunne
ead53d8dff Merge "Bug 5437846: Crash in SpellChecker" 2011-10-10 15:18:35 -07:00
Justin Ho
0d98abbe92 am 832c5485: Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom
* commit '832c54857519c405d7aa0d3bccfe74078f1a1abf':
  Update screen lock/unlock sound Bug: 5416299
2011-10-10 14:43:35 -07:00
Justin Ho
406c8d58b6 am 17249d64: Adding Pollux notification tone Bug: 5416299
* commit '17249d6472b85e669c1b854fc413888e78af6def':
  Adding Pollux notification tone Bug: 5416299
2011-10-10 14:43:33 -07:00
Amith Yamasani
3f315a71fe am 9e7caa0b: Tie the lockscreen sounds with the ringer volume.
* commit '9e7caa0b270f8cea1fd2a61c5bffcf0df1037970':
  Tie the lockscreen sounds with the ringer volume.
2011-10-10 14:37:25 -07:00
Marco Nelissen
594ef41306 am 803ce0f9: (-s ours) Use SoundPool instead of Ringtone.
* commit '803ce0f9fdd455dc4ec0c6ad9c141c76315fd4da':
  Use SoundPool instead of Ringtone.
2011-10-10 14:37:23 -07:00
Romain Guy
2b330380bd Merge "Make sure we have the correct GL context when grabbing a bitmap Bug #5427391" 2011-10-10 14:07:10 -07:00
Jeff Brown
f4735db7de Merge "Fix ownership of CursorWindows across processes. Bug: 5332296" 2011-10-10 14:06:09 -07:00
Derek Sollenberger
ca5115073f Merge "Delay sending Plugin Draw event until the surface is ready." 2011-10-10 13:28:01 -07:00
John Reck
fe85f77701 Merge "Improve loadData JavaDoc" 2011-10-10 13:06:54 -07:00
Andreas Huber
4ae6f7dd0e Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater" 2011-10-10 12:45:02 -07:00
Mathias Agopian
8cb9d95002 Merge "enable EGL_IMG_context_priority for the omap4 platform" 2011-10-10 12:38:16 -07:00
Jeff Brown
5d2c571414 Merge "Fix Cursor leak in SettingsBackupAgent. Bug: 5434060" 2011-10-10 11:48:58 -07:00
Jeff Brown
c42c42c849 Merge "Always log StrictMode violations on ENG builds." 2011-10-10 11:48:53 -07:00
Jeff Brown
4d5dbacb42 Merge "Implement CloseGuard in ContentResolver." 2011-10-10 11:48:49 -07:00
Jeff Brown
c461112ad5 Merge "Clean up handrolled Binder proxies. Bug: 5332296" 2011-10-10 11:48:39 -07:00
Adam Powell
6f76cc6e3d Merge "Bug 5430909 - Overlay action bar should consume hover events" 2011-10-10 11:19:35 -07:00
Gilles Debunne
2648cc50a8 Merge "Bug 5250788: LatinIME slows down as amount of Text increases" 2011-10-10 10:54:51 -07:00
Eric Fischer
bf2bf13a87 Merge "Import revised translations." 2011-10-10 10:29:17 -07:00
Justin Ho
f79a081c19 Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom 2011-10-10 10:08:55 -07:00
Ben Murdoch
74802f0234 Merge "Size Autocomplete drop down items correctly." 2011-10-10 09:51:31 -07:00
satok
b7cf1f8a06 Merge "Add a hidden flag for the auto correction indicator in SuggestionSpan" 2011-10-10 01:08:27 -07:00
satok
03d4c0fe16 Merge "Fix the behavior for choosing new default IME not to choose an auxiliary IME as the default IME" 2011-10-10 00:59:41 -07:00
Dianne Hackborn
30f7a7840e Merge "Calling close() outside of the main thread breaks stuff." 2011-10-09 17:14:49 -07:00
Jeff Sharkey
1f3e232eff Merge "Move battery stats to xt_qtaguid for data stats." 2011-10-09 17:08:23 -07:00
Dianne Hackborn
e0480ed758 Merge "Save the click position and restore it on orientation change." 2011-10-09 14:24:49 -07:00
The Android Automerger
516b7afdc8 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-09 13:30:09 -07:00
James Dong
17076cea6a Merge "SurfaceFlinger: screenshots w/ protected buffers" 2011-10-09 09:16:37 -07:00
Roman Nurik
e0f8c8659b Merge "Update Icon Guidelines and Icon Templates Pack for ICS" 2011-10-08 16:23:16 -07:00
Costin Manolache
99950d5c71 Merge "b/5399355 StringIndexOutOfBoundsException from AccountManagerService" 2011-10-07 17:54:05 -07:00
Jamie Gennis
9575f60722 SurfaceFlinger: screenshots w/ protected buffers
This change modifies SurfaceFlinger's screenshot behavior when a layer
with a protected buffer is visible.  The previous behavior was to simply
fail the screenshot.  The new behavior is to render the screenshot using
a placeholder texture where the protected buffer would have been.

Change-Id: I5e50cb2f3b31b2ea81cfe291c9b4a42e9ee71874
2011-10-07 17:53:37 -07:00
Mathias Agopian
57bf9e7100 enable EGL_IMG_context_priority for the omap4 platform
Bug: 5311015
Change-Id: Icaad3d1c963d382ac0a4b9121fe20d3408846c2b
2011-10-07 15:42:53 -07:00
Mathias Agopian
cb061fd9da Merge "don't log EGL errors due to unimplemented proprietary extensions" 2011-10-07 15:38:51 -07:00
Dianne Hackborn
fdacaf930b Merge "Fix how we hide and show the nav bar." 2011-10-07 15:12:17 -07:00
Jeff Brown
6f9792dccf Merge changes Idbfeb3cc,I03e8e2e7,Iff9eed78
* changes:
  Fix regression in CursorWindow.getString() Bug: 5332296
  Clean up CursorWindow lifetime. Bug: 5332296
  Fix regression in CursorWindow.copyStingToBuffer. Bug: 5332296
2011-10-07 15:08:24 -07:00
Jeff Brown
844c6abe18 Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009" 2011-10-07 15:07:56 -07:00
Michael Kolb
7462725376 Merge "Handle audio focus in HTML5 audio" 2011-10-07 15:07:29 -07:00
Romain Guy
5c622720a1 Merge "Stupid fixed point math. Bug #5423215" 2011-10-07 15:04:15 -07:00
Steven Ross
771e55b97b Merge "Fixing alarm clock bug" 2011-10-07 14:36:25 -07:00
Christopher Tate
758f29f207 Merge "Fix wallpaper restore" 2011-10-07 13:36:09 -07:00