Commit Graph

39591 Commits

Author SHA1 Message Date
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
Jeff Brown
de27227026 Fix regression in CursorWindow.copyStingToBuffer.
Bug: 5332296

Change-Id: Iff9eed786f0a8293b6156f883a66a322ddad5e99
2011-10-07 13:28:18 -07:00
John Reck
7945953a44 Merge "Fix calc visible to account for action bar" 2011-10-07 13:10:55 -07:00
Matthew Xie
2cd9e2d2bb Merge "Turn off debug messge" 2011-10-07 12:57:08 -07:00
Fabrice Di Meglio
d270ea2dfc Merge "Fix bug #5371117 Regression : The Hebrew / Arabic text behavior in ICS latest build is wrong" 2011-10-07 12:30:58 -07:00
Jason Sams
ce9782210d Merge "Simplify the way we get the version info. Reduces startup overhead." 2011-10-07 11:58:15 -07:00
Adam Powell
18f9474f1d Merge "Fix bug 5399568 - ListView check states inconsistent after data set change" 2011-10-07 11:16:51 -07:00
Andreas Huber
17a880a16c Merge "Specifying -1 for both low and highwater marks would not actually do the right thing" 2011-10-07 10:08:48 -07:00
Iliyan Malchev
9a0bd1baa4 Merge "Add initialize method to CameraHardwareInterface" 2011-10-07 09:57:26 -07:00
Steve Block
7721d7dee7 Merge "Add WebViewClient.onProceededAfterSslError()" 2011-10-07 09:53:43 -07:00
Andreas Huber
b6f7145ba3 Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher" 2011-10-07 07:59:35 -07:00
The Android Open Source Project
e8b410bee2 Reconcile with ics-factoryrom-release
Change-Id: I432900d452f3f8869f42a0ff4ae0d34e1c34dc46
2011-10-07 05:35:36 -07:00
Chih-Chung Chang
50ed63d8d9 Merge "Allow shutter/recording sound to be adjusted unless it's forced." 2011-10-07 03:20:26 -07:00
Wu-cheng Li
9a113ce9fe Merge "Allow Camera.setDisplayOrientation to be called when preview is active." 2011-10-07 03:08:23 -07:00
The Android Automerger
0b2c66ca39 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-06 20:52:50 -07:00
James Dong
3428e41a41 Merge "Fix an issue where we should allow negative values but did not" 2011-10-06 20:38:29 -07:00
Christopher Tate
064d8440aa am a0c39e28: (-s ours) DO NOT MERGE: fix wallpaper restore
* commit 'a0c39e28e56d642168ad18dccb86f5787b4e1592':
  DO NOT MERGE: fix wallpaper restore
2011-10-06 20:00:25 -07:00
Scott Main
6c06486d69 Merge "docs: deprecate thingy" 2011-10-06 18:41:48 -07:00
Nicolas Roard
b235502492 Merge "Trigger a full screen repaint when touching layers, as webkitDraw() may not generate the correct invalidations." 2011-10-06 18:29:20 -07:00
Ying Wang
a61153e8ac Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf" 2011-10-06 18:25:22 -07:00
Anirudh Dewani
2ea0c1972b Merge "Docs changes for WiFiDirect sample" 2011-10-06 17:57:55 -07:00
Svetoslav Ganov
e0f66c859a Merge "Accessibility test automation API not working." 2011-10-06 17:28:51 -07:00
Philip Milne
31d246845c Merge "Move Activity1 and Activity2 to API Demos area in development/samples." 2011-10-06 17:21:08 -07:00
Justin Ho
a2e315be95 Merge "Reference download asset through intermediate." 2011-10-06 16:28:57 -07:00
Jeff Brown
5c905ea7de Merge "Clean up CursorWindow code. Bug: 5332296" 2011-10-06 16:28:15 -07:00
Justin Ho
05838ff98e am 65162b1e: Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
* commit '65162b1ee430cb8050109327a7fd958fa72d64ac':
  Adding 3 additional notification sounds Bug: 5416299
2011-10-06 15:57:38 -07:00
Justin Ho
271d3ed41c Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom 2011-10-06 15:51:43 -07:00
Chia-chi Yeh
87b869ece2 Merge "VPN: temporarily disable the default proxy when VPN is active." 2011-10-06 15:29:50 -07:00
Chia-chi Yeh
f2cb45d4f8 Merge "ConnectivityService: detach the logic of global proxy." 2011-10-06 15:29:43 -07:00
Dianne Hackborn
80f66b685a Merge "Fix issue #5371530: SYSTEMUI_FLAG_HIDE_NAVIGATION reasserts itself immediately" 2011-10-06 15:15:32 -07:00
Svetoslav Ganov
5177755699 Merge "Fixing errors in position information of scrollable views reported for accessibility." 2011-10-06 15:13:06 -07:00
Jeff Brown
cc0bf53f21 Clean up CursorWindow code.
Bug: 5332296

The code is functionally equivalent, but a little more efficient
and much easier to maintain.

Change-Id: I90670a13799df05831843a5137ab234929281b7c
2011-10-06 14:40:13 -07:00
Chet Haase
e7244280cd Merge "Fix issue #5367164: memory leak in LayoutTransition" 2011-10-06 14:35:53 -07:00
Jake Hamby
2da73a572b Merge "Enable support for multiple SMSDispatchers in CDMALTEPhone." 2011-10-06 14:05:58 -07:00