Conley Owens
5e3562a5a5
am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 14:53:15 -07:00
Conley Owens
8279c193d1
am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 14:53:10 -07:00
Gilles Debunne
214a8627c5
Support for overlapping spans in TextView's suggestions.
...
Implemented the merging of the different spans, highlighting words that actually differ.
Some TODO left in the code.
Change-Id: Iaf01f36b07d01639a4009cced6ea9b055ce9cc1f
2011-04-27 14:34:00 -07:00
Chet Haase
75e3ef048d
Merge "Fix various hw-accelerated line/point bugs"
2011-04-27 14:26:40 -07:00
Gilles Debunne
0f9ae274b4
Typo in TextAppearanceSpan documentation
...
Dim does not exist anymore.
Change-Id: I83268657accfef15561ce313b66108adc108dfc6
2011-04-27 14:25:56 -07:00
Romain Guy
2ef1ce494c
Merge "Correctly compute tex coords for rect layers. Bug #4192695 "
2011-04-27 14:23:36 -07:00
Chet Haase
8a5cc92a15
Fix various hw-accelerated line/point bugs
...
All accelerated lines are now rendered as quads. Hairlines used to
be rendered as GL_LINES, but these lines don't render the same as our
non-accelerated lines, so we're using quads for everything. Also, fixed
a bug in the way that we were offsetting quads (and not offseting points)
to ensure that our lines/points actuall start on the same pixels as
Skia's.
Change-Id: I51b923cc08a9858444c430ba07bc8aa0c83cbe6a
2011-04-27 14:23:29 -07:00
Romain Guy
9fc27819d7
Correctly compute tex coords for rect layers.
...
Bug #4192695
This change also fixes Javadoc links in the framework.
Change-Id: Ia548bcb18baba5d6fe6a4a04a2278e3a3bd465b2
2011-04-27 14:21:41 -07:00
Conley Owens
b4a56f10d8
am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'ba5aebd106c61567ad6be905efd18902025735aa':
Add lock before calling initEglImage
2011-04-27 13:54:08 -07:00
Conley Owens
a6590e7fee
am 13b21e60: Merge "Auto hide virtual keyboard"
...
* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard
2011-04-27 13:53:46 -07:00
Conley Owens
cfe7b9fcfa
am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
...
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 13:53:37 -07:00
Eric Fischer
a4e7353d33
Import revised translations. DO NOT MERGE
...
Change-Id: I36de477855f825da9a3626becd1927c31639e23d
2011-04-27 13:50:09 -07:00
Conley Owens
779fa1515d
am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
...
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:48:45 -07:00
Conley Owens
ba5aebd106
am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
Add lock before calling initEglImage
2011-04-27 13:41:12 -07:00
Alex Sakhartchouk
4658d779e3
Check setName() for null string + fix rsRand().
...
Change-Id: I5e0042930209861e2eb9acc91380e9473dac0997
2011-04-27 13:30:43 -07:00
Jason Sams
36f873c765
Merge "Cleanup rs.spec file and code generator."
2011-04-27 13:20:39 -07:00
Conley Owens
13b21e608e
Merge "Auto hide virtual keyboard"
2011-04-27 13:20:16 -07:00
Conley Owens
a538b4a206
Merge "onDetachedFromWindow is called before onAttachedToWindow"
2011-04-27 13:14:57 -07:00
Dima Zavin
24fc2fb1c5
audio/media: convert to using the audio HAL and new audio defs
...
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 13:10:10 -07:00
Conley Owens
4a4d96e7ee
Merge changes I0ab47e2f,Ib8016996
...
* changes:
Remove errant tag terminator
Normalize output of XMLtree content
2011-04-27 13:06:46 -07:00
Conley Owens
ac505b86b4
am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage
2011-04-27 12:46:09 -07:00
Conley Owens
f0556bb90f
am 86d1d747: Merge "Add lock before calling initEglImage"
...
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage
2011-04-27 12:43:19 -07:00
Conley Owens
86d1d74762
Merge "Add lock before calling initEglImage"
2011-04-27 12:28:05 -07:00
Gloria Wang
c7d1d6288e
am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit 'd84df05490e8b102e81cca848f65c174398be1b6':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:27:05 -07:00
Conley Owens
3064878a02
am b54bebf4: am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit 'b54bebf47fcd1cfbfdccd67e062d856ec06ce825':
Fix for startup NPE.
2011-04-27 12:24:58 -07:00
Gloria Wang
d84df05490
am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit '969749319ca17f6e0c6836303a78cc484df2539b':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:24:42 -07:00
Conley Owens
b54bebf47f
am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
Fix for startup NPE.
2011-04-27 12:21:50 -07:00
Conley Owens
470239a090
am 30d59fa9: Ignore fix for startup NPE as file is deleted.
...
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.
2011-04-27 12:18:03 -07:00
Gloria Wang
969749319c
am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
...
* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
Add heartbeat error codes into MediaErrors.h
2011-04-27 12:11:49 -07:00
Svetoslav Ganov
13dfabde84
Merge "The accessibility input filter state was not unregistered when no spoken feedback accessibility services are regitstered."
2011-04-27 12:11:01 -07:00
Conley Owens
30d59fa90f
Ignore fix for startup NPE as file is deleted.
...
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
2011-04-27 12:09:35 -07:00
Alex Sakhartchouk
998d4570bd
Merge "Better workaround for the bitmap invalidation problem."
2011-04-27 12:08:59 -07:00
Svetoslav Ganov
a3e261d506
The accessibility input filter state was not unregistered when
...
no spoken feedback accessibility services are regitstered.
bug:4343996
Change-Id: Ie709ac24baa084cf3627d6adb6caf1550c399f8b
2011-04-27 12:06:28 -07:00
Conley Owens
44935c2908
Merge "Fix for startup NPE."
2011-04-27 11:40:46 -07:00
Daniel Sandler
6d8a98afb0
Make InputWindow.h's window types align with WindowManager.java's.
...
Change-Id: Ia4919e02882ebc682c80bfaae1fa775606f17098
2011-04-27 14:08:17 -04:00
Guang Zhu
d45d463095
Merge "Make DRT pull data over network"
2011-04-27 11:05:28 -07:00
Dima Zavin
4dc22e77cf
libmedia: move AudioParameter out of AudioSystem
...
Change-Id: I9eb7e002d141936258050d4fa4f0ccd8202bfc54
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 10:48:38 -07:00
Dima Zavin
5e20a3dd44
audioflinger: move legacy audio hw/policy out to libhardware_legacy
...
Change-Id: I4adcec73d3c08bcbe15bb19e1ba2ff18b195af45
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 10:48:38 -07:00
John Reck
3bd9295799
Merge "Add support for force-enabling zoom"
2011-04-27 10:46:39 -07:00
Bjorn Bringert
1bde6f428e
Merge "Expose TTS engine API"
2011-04-27 01:16:21 -07:00
Bjorn Bringert
4bbca889df
Expose TTS engine API
...
This is a new API for writing text-to-speech engines.
The existing API for apps that use TTS remains the same,
with some minor additions.
Change-Id: Id577db449ae0e5baec40621d4a08387dbd755342
2011-04-27 08:25:24 +01:00
satok
ece92d34fc
Fix a bug in InputMethodSubtype#hashCode
...
Bug: 4345760
Not to use resource ids for calculating hashCode
Change-Id: I29d2555aeb7d0e51205d9f1fe0da708df0890942
2011-04-27 16:09:53 +09:00
Ramesh Sudini
38d284d323
Remove subclass cast for calls to isDnsCheckDisabled.
...
Change-Id: Ic9121db810b295d9f614046932badf04f07a42db
2011-04-26 21:17:06 -07:00
Gloria Wang
83ddcdf7fd
Add heartbeat error codes into MediaErrors.h
...
related-to-bug: 4322415
Change-Id: I78137c61e3a8ce9afcb9fb38cb77a83561b9b72d
2011-04-26 19:35:32 -07:00
Adam Powell
f076aa5594
Merge "Fix overlay action bar decor layout for lower context mode area."
2011-04-26 18:38:23 -07:00
Adam Powell
62ada81ee1
Fix overlay action bar decor layout for lower context mode area.
...
Change-Id: I36287c36ed36179eed2b742d494d18de87541001
2011-04-26 18:37:24 -07:00
Nick Pelly
25d2893515
am 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
...
* commit '3fa53e448a4b2255f6ed14f8b8355ac2ee3379e9':
Implement dead service recovery in NFC extras library.
2011-04-26 18:11:02 -07:00
Nick Pelly
3fa53e448a
am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.
...
* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
Implement dead service recovery in NFC extras library.
2011-04-26 18:09:02 -07:00
Mathias Agopian
faee9c397d
Merge "Report errors when eglCreateImageKHR fails"
2011-04-26 18:05:23 -07:00
Nick Pelly
36e6c4c194
am cc9ee72b: Implement dead service recovery in NFC extras library.
...
* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
Implement dead service recovery in NFC extras library.
2011-04-26 18:04:02 -07:00