Mathias Agopian
961d594575
Merge "improve GraphicAllocator dump method"
2011-08-01 12:15:07 -07:00
Jeff Brown
3a95b56682
Merge "Tweak hover for better accessibility and compatibility. Bug: 5087943"
2011-08-01 12:14:24 -07:00
Jamie Gennis
1ad0da83fd
Merge "SurfaceFlinger: abandon Layer SurfaceTextures"
2011-08-01 12:10:47 -07:00
Eric Fischer
37363f858a
am 72b7a7d9: (-s ours) am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '72b7a7d90b631a703681751c02f1447e3c75ccb0':
Import revised translations. DO NOT MERGE
2011-08-01 11:23:08 -07:00
Eric Fischer
45923cdc11
am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'f01b3cfa9ac2869e3762a90917569186039a9665':
Import revised translations. DO NOT MERGE
2011-08-01 11:19:59 -07:00
Eric Fischer
c1cf37d145
am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
Import revised translations. DO NOT MERGE
2011-08-01 11:17:17 -07:00
Eric Fischer
061ad637f7
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-08-01 11:15:58 -07:00
Andreas Huber
290fa96983
Merge "Start playing live streaming HLS content from the first segment."
2011-08-01 10:46:51 -07:00
Matthew Xie
78dede3618
Merge "Change setDevicePropertyNative to no block."
2011-08-01 10:20:30 -07:00
Luca Zanolin
13e0e40ecd
Merge "Sort the suggestions based based on the length of the text they are attached too."
2011-08-01 09:51:29 -07:00
Mike Lockwood
71521279a6
Merge "MediaScanner: Move genre table management to MediaProvider"
2011-08-01 09:31:57 -07:00
Justin Ho
edf865ad4d
Merge "Update list_ states Bug: 5076695"
2011-08-01 07:27:11 -07:00
Jamie Gennis
dbe6486ca1
SurfaceFlinger: abandon Layer SurfaceTextures
...
This change makes the Layer::onRemoved method call
SurfaceTextures::abandon on the layer's SurfaceTexture. This will cause
all client-initiated operations on the SurfaceTexture to fail. In
particular, this will result in an error on the client side, rather than
a deadlock when removing a layer that used a SurfaceTexture in
synchronous mode.
Change-Id: I14014d00369f29560a21b606831edee432bb8867
Bug: 5020874
2011-07-30 14:38:20 -07:00
Justin Ho
8d944d254b
Merge "Updated backgrounds Bug: 5076695"
2011-07-29 16:55:51 -07:00
Mathias Agopian
a947de88e7
improve GraphicAllocator dump method
...
GraphicAllocator debugging cannot deal with
custom HAL formats. make this more obvious in the
log.
Change-Id: I202e58a7f213f32e725aa4eac62cdf6e50ca5894
2011-07-29 16:35:41 -07:00
Jamie Gennis
96cdaaefa0
Merge "SurfaceFlinger: fix a layer occlusion bug"
2011-07-29 16:18:38 -07:00
Justin Ho
79f24d2902
Merge "Removing unnecessary textfield_active assets Bug: 5094669"
2011-07-29 15:56:15 -07:00
Scott Main
663396e0a4
Merge "add since flag for ICS"
2011-07-29 15:10:27 -07:00
Jesse Wilson
003b7ffbb2
Merge "Restore the 'final' bit on DataInputStream.read()"
2011-07-29 14:41:01 -07:00
Svetoslav Ganov
d5ab640263
Merge "Improving accessibility feedback for two state widgets."
2011-07-29 14:06:44 -07:00
Kristian Monsen
70b5c841e6
Merge "Part of fix for bug 4997380: Some error types unknown to SslError"
2011-07-29 12:35:45 -07:00
Derek Sollenberger
b0d9a46694
Merge "Add a runtime switch between Raster and Ganesh rendering modes."
2011-07-29 12:34:32 -07:00
Derek Sollenberger
b17fe78fe6
Merge "resolved conflicts for merge of 13639b0d to master"
2011-07-29 12:28:16 -07:00
Mike Lockwood
ba58c0b42b
Merge "Clean up USB configuration switching logic and beef up error handling"
2011-07-29 12:13:04 -07:00
Gilles Debunne
e303f673f5
Merge "New interaction model for suggestions"
2011-07-29 11:47:12 -07:00
Derek Sollenberger
569d6c278e
resolved conflicts for merge of 13639b0d to master
...
Change-Id: I6fb2ac2702fc662c1892537de6d4db20d5e709d6
2011-07-29 14:39:06 -04:00
Amith Yamasani
d5b380004c
Merge "Don't submit a query if it's whitespace only."
2011-07-29 11:28:37 -07:00
Derek Sollenberger
9dd6682a5a
Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-07-29 11:24:37 -07:00
Svetoslav Ganov
6bd27c915f
Merge "InputFilter not updated on global accessibility change."
2011-07-29 11:22:42 -07:00
Christopher Tate
0900cf89bb
Merge "Require the current backup pw in all backup/restore operations"
2011-07-29 11:20:45 -07:00
Derek Sollenberger
33e86c7a91
resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp
...
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
2011-07-29 14:16:18 -04:00
Robert Greenwalt
cbbbb2ae26
am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
...
* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
Fix NPE when going from proxy to no proxy.
2011-07-29 10:55:58 -07:00
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