Daniel Sandler
472f6d102c
Merge "Quick fix for NPE in updateNotification()."
2011-07-29 10:53:17 -07:00
Robert Greenwalt
f9c0f5aa4f
am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
...
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
Fix NPE when going from proxy to no proxy.
2011-07-29 10:53:16 -07:00
Robert Greenwalt
4535086245
Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
2011-07-29 10:51:32 -07:00
Dianne Hackborn
11429776fd
Merge "Various work on out of memory managment."
2011-07-29 10:43:26 -07:00
Derek Sollenberger
da9b83b82f
Merge "Fix NinePatch decoder when the target is smaller than the source."
2011-07-29 10:41:12 -07:00
Derek Sollenberger
bbfbd30383
am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
...
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
Adding an optional param to the SurfaceTexture constructor.
2011-07-29 09:53:09 -07:00
Derek Sollenberger
adbba1fda0
am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
...
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
Adding an optional param to the SurfaceTexture constructor.
2011-07-29 09:50:11 -07:00
Daniel Sandler
1eabe6c05f
Merge "Fix NPE for devices with hardware navigation."
2011-07-29 09:49:13 -07:00
Nick Pelly
8cc351abb2
Merge "Workaround for bug 5082381 (EALREADY on ACL collision)."
2011-07-29 09:44:30 -07:00
Daniel Sandler
82cd9c415c
Merge "Protect animation methods from Proguard."
2011-07-29 09:43:30 -07:00
Derek Sollenberger
0ed90b7894
Merge "Adding an optional param to the SurfaceTexture constructor."
2011-07-29 09:43:13 -07:00
Robert Greenwalt
afcfd1fd97
am 86574d66: am 0d8acea9: Make copy-constructor make deep copy.
...
* commit '86574d66dacc09c9b5a0a0ab2623ec01704b6fc8':
Make copy-constructor make deep copy.
2011-07-29 09:24:38 -07:00
Robert Greenwalt
67020c06fc
am 0d8acea9: Make copy-constructor make deep copy.
...
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
Make copy-constructor make deep copy.
2011-07-29 09:20:51 -07:00
Derek Sollenberger
77c988cf4e
Adding an optional param to the SurfaceTexture constructor.
...
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
2011-07-29 11:06:24 -04:00
Daniel Sandler
0d1ae35641
Merge "Bring the shiny navigation button animations to phones."
2011-07-29 06:48:43 -07:00
Daniel Sandler
2c34bd740c
Merge "The fullest of fullscreen modes."
2011-07-29 05:45:55 -07:00
Daniel Sandler
b90941a585
Merge "New richly-appointed navigation buttons."
2011-07-29 04:52:44 -07:00
Daniel Sandler
121316bac6
Merge "Correct android:dimen/status_bar_icon_size for tablets."
2011-07-29 04:52:01 -07:00
Kristian Monsen
4eb0fea354
Merge "Part of fix for bug 5065047 build libchromium as a shared lib"
2011-07-29 03:37:49 -07:00
satok
45087eb13d
Merge "Fix issues in TextServicesManagerService"
2011-07-29 03:29:46 -07:00
Jean Chalard
653bbcce38
Merge "Fix a bug where a provider could be never released."
2011-07-28 19:36:32 -07:00
Romain Guy
56d9191c4a
Merge "Don't create hw layers when there's no hw context. Bug #5093805 "
2011-07-28 19:25:29 -07:00
satok
d13ba4c6ea
Merge "Handle the existing binds to spell checkers correctly."
2011-07-28 18:09:59 -07:00
Jim Miller
567e9fe186
Merge "Fix 5044158: Initial pass: add music transport controls to LockScreen"
2011-07-28 18:04:21 -07:00
Matthew Xie
ef7b033cbb
Merge "Provide an API to set the friendly name of a remote device."
2011-07-28 17:46:45 -07:00
Chris Craik
53011a5dc5
Merge "use pageswap callback to sync WebTextView with drawing of page"
2011-07-28 17:23:57 -07:00
Wu-cheng Li
3de8e30890
Merge "Add frame metadata parameter to camera data_callback."
2011-07-28 17:23:35 -07:00
Adam Powell
2ca7240aed
Merge "Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize if activity handles orientation change"
2011-07-28 16:40:03 -07:00
Justin Ho
645622d9b9
Merge "Updated popup assets Bug: 5080369"
2011-07-28 16:39:36 -07:00
Justin Ho
e75bb153be
Merge "Updated spinner assets Bug: 5076695"
2011-07-28 16:39:21 -07:00
Justin Ho
e08ce7b090
Merge "Updated check_on and check_off"
2011-07-28 16:38:52 -07:00
Christopher Tate
479d20d8a9
Merge "Support full-backup encryption and global backup password"
2011-07-28 16:28:21 -07:00
Romain Guy
aea38c43fc
Merge "Add notifyPixelsChanged() call to NDK unlockPixels()."
2011-07-28 16:26:08 -07:00
Irfan Sheriff
b14d7af9ba
Merge "Changed walled garden to better url"
2011-07-28 16:24:38 -07:00
Jamie Gennis
db5230f444
SurfaceFlinger: fix a layer occlusion bug
...
This change fixes a bug where the window visibility would be computed
before any buffers were available, causing the window to be treated as
non-opaque. When the first buffer arrived, if both mCurrentOpacity and
the opacity determined by the buffer's format were 'opaque', a
recomputation of the opacity would not be done, and the window would
continue to be treated as non-opaque. SurfaceFlinger could then
unnecessarily draw fully occluded layers.
Change-Id: I2b95da2f4b50e68d50fc5afd8b772e26e62f58d6
Bug: 5057122
2011-07-28 16:03:28 -07:00
Svetoslav Ganov
b3bca856a2
Merge "Updaing the database version"
2011-07-28 15:57:25 -07:00
Romain Guy
4435d4d726
Merge "Correctly apply linear filter to drawBitmap(Rect, Rect)"
2011-07-28 15:43:31 -07:00
Adam Cohen
f697d67ac9
Merge "Fixing widget notifyDataSetChanged() not getting called, issue 5092676"
2011-07-28 15:36:19 -07:00
Justin Ho
594af9e3fd
Merge "Updated presence icons Bug: 5045000"
2011-07-28 15:13:55 -07:00
Jeff Sharkey
59bb87f488
Merge "Keep original DialogTitle color when resizing."
2011-07-28 14:16:50 -07:00
Mike Lockwood
a0f070dfc4
am 21700fed: am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit '21700fedfe29f6a0a752d2bea46142038e69136c':
gps: Adding ip address for AGps
2011-07-28 14:06:07 -07:00
Mike Lockwood
1dc4736a33
am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit '5f7203eb258503bc5d2ba29176bdf483a68a93b8':
gps: Adding ip address for AGps
2011-07-28 14:04:13 -07:00
Eric Laurent
4ab2ffbf84
Merge "Fix issue 5090721: audio record broken"
2011-07-28 14:03:33 -07:00
Mike Lockwood
15c8cd406b
am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
gps: Adding ip address for AGps
2011-07-28 14:02:14 -07:00
Robert Greenwalt
beb707090b
Merge "Stop sending tethering broadcasts during boot."
2011-07-28 14:00:48 -07:00
Mike Lockwood
7779a44043
am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
gps: Adding ip address for AGps
2011-07-28 14:00:27 -07:00
Mike Lockwood
7c95ffbbcc
Merge "gps: Adding ip address for AGps"
2011-07-28 13:52:55 -07:00
Mike Lockwood
3b34215ced
am f8d13e53: am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit 'f8d13e535c3e6166c2386adac3b3a2f115d2b79d':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:30:24 -07:00
Mike Lockwood
94a10fa407
am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit 'bf676d460d1d1fc8923982006c38d0f6785daea8':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:27:27 -07:00
Mike Lockwood
b0e2827bce
am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit '7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:25:34 -07:00