Commit Graph

39163 Commits

Author SHA1 Message Date
Jim Miller
a18d169c46 Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom 2011-09-26 18:41:01 -07:00
Jamie Gennis
2a0d5b6084 SurfaceFlinger: fix setting default buffer size
This change makes SurfaceFlinger update a SurfaceTextureLayer's default
buffer size in response to a window resize even if the Layer is in fixed
size mode.

Change-Id: I3871c8f19a045d03904d1284390cad7659be71ff
Bug: 5366426
2011-09-26 18:38:52 -07:00
Chia-chi Yeh
c82058f756 Merge "VpnDialogs: revise UI layout." 2011-09-26 17:29:38 -07:00
Christopher Tate
90236762b9 Merge "Don't hang in restore if the transport reports failure" into ics-factoryrom 2011-09-26 17:12:08 -07:00
Christopher Tate
3bc590f531 Merge "Use the new INSTALL_FROM_ADB Package Manager flag..." 2011-09-26 17:12:01 -07:00
Peter Ng
e716603dc5 Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic" 2011-09-26 17:02:06 -07:00
Fabrice Di Meglio
24101a0b9c Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ics-factoryrom 2011-09-26 16:58:35 -07:00
Mathias Agopian
0270c8cbf2 Merge "Make the status and navigation bars OPAQUE." into ics-factoryrom 2011-09-26 16:19:26 -07:00
Mathias Agopian
4924e61d03 Merge "don't clear the framebuffer when the framebuffer is not used" into ics-factoryrom 2011-09-26 16:19:04 -07:00
Mathias Agopian
71042c0c4e Merge "Do not blend opaque windows." into ics-factoryrom 2011-09-26 16:18:59 -07:00
The Android Automerger
c6ce130bdf merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-26 16:17:09 -07:00
Mathias Agopian
4801404dcb don't clear the framebuffer when the framebuffer is not used
when areas of the FB are undefined (transparent windows on top of
nothing), we clear those areas before composition.
however, it makes no sense to do this when the FB is not in use
(case where hwc handles all layers)

Bug: 5360529
Change-Id: I761a7d3664228ebbee0944aca8b0cc278fc94c9c
2011-09-26 16:14:05 -07:00
Romain Guy
bdbfe03555 Merge "Do not blend opaque windows." 2011-09-26 16:13:01 -07:00
Mathias Agopian
e488c209c4 Merge "Region cannot handle malformed Rects. Abort the Region op in that case." 2011-09-26 16:10:08 -07:00
Mathias Agopian
a970cabc5c Region cannot handle malformed Rects. Abort the Region op in that case.
Bug: 5331198, 5334829
Change-Id: I05f2aaa95c55fe9e4a5d23180bb3032896c88151
2011-09-26 16:08:52 -07:00
Mathias Agopian
43b4c1e97b Make sure Region handles invalid rectangles
the boolean operation code assumes rects are valid and
could go into an infinite loop if not. make sure we
abort before that happens.

Bug: 5331198, 5334829
Change-Id: I8aa42b2e0b37238ec2434b794dd84c1a1b70f163
2011-09-26 16:08:42 -07:00
Mathias Agopian
0857c8f7f1 Region cannot handle malformed Rects. Abort the Region op in that case.
Bug: 5331198, 5334829
Change-Id: Ib1fdbf6fb291e7f1191ccfe16b5ff29d73e7a474
2011-09-26 15:58:20 -07:00
Jamie Gennis
36d2c1f02c Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom 2011-09-26 15:44:41 -07:00
Jeff Sharkey
40b384b293 Merge "Overlay to configure data usage network types." 2011-09-26 15:34:06 -07:00
Jamie Gennis
87e6641d49 Merge "SurfaceFlinger: fix the transform hint" into ics-factoryrom 2011-09-26 15:09:15 -07:00
Justin Ho
35c41dd397 Merge "Fixed alignment on home icon Bug: 5348452" 2011-09-26 14:57:56 -07:00
Eric Fischer
24e7abef86 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-26 14:55:58 -07:00
Chet Haase
4f33ab422e Merge "Fix display list issue that was crashing an external app." 2011-09-26 14:46:19 -07:00
Gilles Debunne
4cea637361 Merge "Bug 5250788: TextView gets slower as the text length grows" 2011-09-26 14:18:14 -07:00
Daniel Sandler
1098f105e5 am 61b645ab: Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
* commit '61b645ab86ace1511593f1f1f46dfb62bf0ae8b9':
  Update all RSSIs whenever the connectivity changes.
2011-09-26 12:39:01 -07:00
Daniel Sandler
c4d3dfaa97 Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom 2011-09-26 12:37:29 -07:00
Fabrice Di Meglio
6fe67dd8d8 Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE" 2011-09-26 12:16:41 -07:00
Fabrice Di Meglio
62f4feb9ca Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak" 2011-09-26 12:16:30 -07:00
The Android Open Source Project
4c7d708d70 Reconcile with ics-factoryrom-release
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
2011-09-26 12:11:29 -07:00
Ben Komalo
4748278047 am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
* commit '69a6d537e6f29683f685ecb688f0b06b1c0b2b15':
  Enter minimal boot mode when booting encrypted
2011-09-26 12:02:19 -07:00
Ben Komalo
ee557f78b9 Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom 2011-09-26 12:01:01 -07:00
Jason Sams
1ad7cc0b2b Merge "Remove unused fields in ProgramRaster" 2011-09-26 11:57:41 -07:00
Andreas Huber
f2d8a37193 Merge "Properly connect to surface flinger in our shell tools" 2011-09-26 11:26:59 -07:00
Andreas Huber
fb3e044cca Merge "Propagate error signalled by the source all the way to the output EOS notification." 2011-09-26 11:03:05 -07:00
Gilles Debunne
fe3a3afb70 Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up" 2011-09-26 10:38:58 -07:00
Wink Saville
e5c06166e9 am 2783e1ce: Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
* commit '2783e1ce7a9b2c82983223754228c06be6713a0f':
  Remove unused persist.radio.imsregrequired.
2011-09-26 10:27:16 -07:00
Wink Saville
397c92dc01 Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom 2011-09-26 10:25:21 -07:00
Kenny Root
1677362d1b Merge "Allow non-required package verifiers" 2011-09-26 09:53:06 -07:00
Justin Ho
243c6f33dc am 48704d49: Updated key and effect sounds
* commit '48704d4962f2120c62726eaa8bc6ec2d8a71071d':
  Updated key and effect sounds
2011-09-26 09:50:01 -07:00
Steve Block
dcbb82a24e Merge "Update the error for WebView thread violations to make clear that it's not fatal" 2011-09-26 08:41:09 -07:00
Andreas Huber
c42d1f4d0b Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries" 2011-09-26 08:09:11 -07:00
Ben Murdoch
1f6293c35f Merge "Force a WebView pictureset invalidation on screen rotation." 2011-09-26 06:19:56 -07:00
Brian Colonna
03d75aa97c Merge "FaceLock is now closed if emergency dial button is pressed" 2011-09-26 06:03:02 -07:00
Roman Nurik
a7a78dd480 Merge "Update supported media formats doc for ICS" 2011-09-26 00:16:40 -07:00
Jeff Sharkey
2778b511f6 Merge "Watch network subtype, tethering teardown, empty." 2011-09-25 23:44:10 -07:00
Adam Powell
2a527aefe9 Merge "Fix bug 5358705 - Request no full-screen mode of the IME when a SearchView is expanded in an action bar" 2011-09-25 14:45:59 -07:00
Bart Sears
7c152d0742 Merge "Revert "Transfer large bitmaps using ashmem. Bug: 5224703"" 2011-09-25 14:32:14 -07:00
Bart Sears
8acda78034 Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029

This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
2011-09-25 14:30:21 -07:00
The Android Automerger
b8176f440e merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-25 06:28:45 -07:00
Jeff Brown
b94d5065d2 Merge "Transfer large bitmaps using ashmem. Bug: 5224703" 2011-09-24 20:49:20 -07:00