20106 Commits

Author SHA1 Message Date
Dianne Hackborn
b5052de757 resolved conflicts for merge of a80bab37 to master
Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef
2011-12-13 16:31:43 -08:00
Gilles Debunne
6e87ecbb1d am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
* commit '2450b36a3696bc5afdf2a0f2af8b2008efb8a7b0':
  Do not spell check the foreground ExtractEditText.
2011-12-13 15:59:26 -08:00
Dianne Hackborn
caa8e69a65 Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." into ics-mr1 2011-12-13 15:40:18 -08:00
Gilles Debunne
19636dc421 Merge "Do not spell check the foreground ExtractEditText." into ics-mr1 2011-12-13 15:36:48 -08:00
Dianne Hackborn
33b8ee509f Fix issue #5756204: Crespo IME briefly appears shortened when...
...rotating to landscape

When doing spell checking in the same process as the spell checker, we
need to make sure it is still done asynchronously.

Putting this in I noticed quite a few threading issues in this code, so
I also addressed those (which became very obviously a problem with the
async stuff here now).

Also tweaked the service side to run spell checking at background priority.

Change-Id: I01bafe3bec6bceeca911d6bf2f61a486a2fd4c48
2011-12-13 15:15:33 -08:00
Gilles Debunne
770f0fa92e Do not spell check the foreground ExtractEditText.
Bug 5755099

In extracted text mode, we spell check the background and the foreground
edit text. All changes in the background are already propagated to the
foreground, and updates on the foreground may trigger a spell check
of the entire text since we use setText.

Change-Id: Ie44c3d9113258082ac6df5890851d0e21c702ea2
2011-12-13 14:47:26 -08:00
Dianne Hackborn
ee4d45f305 am 0be53567: am 19a06fe9: Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1
* commit '0be53567c1c2299c548d3204d2b9240108fbd53a':
  Fix issue #5755172: Soft menu key disappears when menu is open
2011-12-13 13:44:14 -08:00
Gilles Debunne
78efa026c7 am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
* commit '0d3a5e4cbddc9a6a0a551698b5152c815842952a':
  NPE in GMail / TextLine
2011-12-13 13:42:07 -08:00
Dianne Hackborn
19a06fe93c Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1 2011-12-13 13:38:56 -08:00
Gilles Debunne
fc997b4f78 NPE in GMail / TextLine
Bug 5753061

https://android-git.corp.google.com/g/#/c/154756/1 revealed an
other bug in SpanSet. The fitered (non empty) spans were added
in their original position instead of being indexed by count.

The nullation on recycle hence left null holes in the array.

Change-Id: If5c1435cee9a2cb88a608aa8e5f4f2f23382154c
2011-12-13 12:37:02 -08:00
Dianne Hackborn
73ab6a49db Fix issue #5755172: Soft menu key disappears when menu is open
We need to work more like before in determining whether the menu
key is needed -- in some cases look back in the window list to
determine this if we don't know the value from the current window.

This requires adding a new private flag indicating whether the
compat menu state is known for a window, which is set by
PhoneWindow as part of its existing process of computing the flag
for its own windows.

Now we can have a new API on WindowState to determine the value
of this flag for a window, which if needed walks back in the window list
to find a window the value is known for (or stops at what the policy
has determined is the top full-screen window, so we stop like we used
to at things like the lock screen or the bottom of an application).

Change-Id: I829de6d629b5af8bcb422cb85249ee4041c7205e
2011-12-13 11:32:11 -08:00
Gilles Debunne
a2ea425f25 Merge "Re-synced MR1 and master for SpellChecker" 2011-12-13 10:31:38 -08:00
Selim Gurun
4f433d53c9 Merge "Move ssl callbacks to webcore thread." 2011-12-13 10:25:18 -08:00
Selim Gurun
38f3610a29 Move ssl callbacks to webcore thread.
Bug: 4586251

Original CL was for ics-mr1. We decided it should be in master
instead. Original CL
https://android-git.corp.google.com/g/154083

Current ssl cert logic makes callbacks to webkit from the
UI thread. This is not right. Move the callbacks to proper thread.

Change-Id: Ie3de7dbaed7780dbb6cf537ca1d29686d867b784
2011-12-13 10:08:27 -08:00
Chris Craik
574a12968a Merge "Update tilebenchmark to work with current drawing infrastructure" 2011-12-13 08:53:06 -08:00
Gilles Debunne
249d1e827a Re-synced MR1 and master for SpellChecker
Some auto-merges got lost, re-syncing master with the latest
and greatest from MR1.

Change-Id: Ifc0b5d1fd2e11e68d219c3f491f37d4c047579a0
2011-12-12 20:06:31 -08:00
Chris Craik
09a71e073a Update tilebenchmark to work with current drawing infrastructure
bug:5062896

depends on external/webkit change: https://android-git.corp.google.com/g/#/c/154840/

- directly discard textures, instead of sending an invalidate through webkit
- better ui on smaller screens
- pass native pointer through jni calls

Change-Id: Icadbf8944edc5a2b1f8dc27bab53ac665c975462
2011-12-12 18:10:53 -08:00
Dianne Hackborn
df3c49ee2e am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1
* commit '2ad8a89b4b55f1cf8994e5b044d496d889839403':
  SDK only: now that support lib is in SDK, we can link to it.
2011-12-12 18:01:22 -08:00
Gilles Debunne
ba36428502 am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1
* commit '8e22ec9bc6c59d9e54a6b48f1133881be97af1a7':
  Prevent a memory leak in TextLine.
2011-12-12 17:49:31 -08:00
Gilles Debunne
a4b1b8ab3c am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1
* commit '7ffadba5dfbeeaa93a9559ca3eaf1a7719426a5f':
  Text blinking cursor hard to see.
2011-12-12 17:49:29 -08:00
Adam Powell
f8c2abcadd am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1
* commit 'bffe0be3af2bd19a392e7d332cbfda9a60b8e057':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
2011-12-12 17:49:21 -08:00
Gilles Debunne
c1761e7fe1 Fixed build after merge
Change-Id: Ifac89a70afa82047d97994860c6e58954f5d91d0
2011-12-12 16:11:47 -08:00
Dianne Hackborn
a1279586dd Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 2011-12-12 16:09:54 -08:00
Gilles Debunne
a1277de3c3 Merge "Prevent a memory leak in TextLine." into ics-mr1 2011-12-12 15:53:25 -08:00
Gilles Debunne
1fb90497b7 Merge "Text blinking cursor hard to see." into ics-mr1 2011-12-12 15:52:39 -08:00
Dianne Hackborn
7871badd5d SDK only: now that support lib is in SDK, we can link to it.
Update some of the platform documentation to directly link to
relevent support lib docs.  Yay!

Also improve BroadcastReceiver documentation to more clearly
discussion security around receivers, and how the support
lib's LocalBroadcastManager can help.

Change-Id: I563c7516d5fbf91ab884c86bc411aff726249e42
2011-12-12 15:39:50 -08:00
Matthew Xie
470d057aed am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
2011-12-12 15:39:27 -08:00
Adam Powell
f93bb6d8fd Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
Preserve the ability to call getChildVisibleRect without the view
being attached to a window.

Change-Id: I702b19fa1625c346eb22fda4a4ffb6e8f790b689
2011-12-12 15:23:12 -08:00
Gilles Debunne
7cb77c1a0d resolved conflicts for merge of 1742f20c to master
Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555
2011-12-12 15:16:42 -08:00
Gilles Debunne
c3fb7a11ad Prevent a memory leak in TextLine.
Bug 5740435

The new SpanSet cached objects should be recycled when the TextLine is
recycled to prevent a reference to their span, which may lead to the
entire activity.

Change-Id: I4469e418a228bd71eb8be1d43ed86de49baba165
2011-12-12 14:03:40 -08:00
Gilles Debunne
961ebb9ab0 Text blinking cursor hard to see.
Bug 5738416

This problem was introduced in
https://android-git.corp.google.com/g/#/c/152599

The invalidated cursor region is no longer expanded to include the
cursor drawable (different from the handles' drawables).

Added that code back. Added a flag, since invalidateRegion is also
used to invalidate text span regions in spell check (assumes the decorated
span bounds are not bigger that text boundaries), which is fine in case
of underline.

When the cursor is moved on a single line, invalidate the whole line
(same as what was done before). This is sub-optimal, will file a bug
to fix this. The core problem is that we should invalidate the previous
and the new cursor's positions. We only have one of these.

Change-Id: I9ada9340fb52aad3d80c39efd021fd3f9ec0cc4d
2011-12-12 13:56:04 -08:00
Gilles Debunne
481c0a2604 am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1
* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
  Fixed SpellCheckerSessions leak in TextView
2011-12-12 13:15:53 -08:00
Gilles Debunne
e495cc3fd9 am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1
* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
  Re-use SpanSets in TextLine
2011-12-12 13:15:46 -08:00
Joe Malin
c789b60076 am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0
* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
  DOC CHANGE: Package text and Formatter javadoc
2011-12-12 13:15:36 -08:00
Matthew Xie
2d789e58a8 Move broadcastState STATE_TURNING_ON before persistSwitchSetting
CTS test revealed that persistSwitchSetting could take more than 1 second.
STATE_TURNING_ON intent missed the test timing. We move the broadcast
before persistSwitchSetting
bug 5740715

Change-Id: I54a0a0afc8d1c4fc28f84e6122809af2f1456ca7
2011-12-12 11:36:18 -08:00
Amith Yamasani
549d5f88bf Merge "Show the current stream's volume in the volume panel." 2011-12-12 09:56:26 -08:00
Ben Murdoch
2ff8cc2438 Merge "Clear the WebView picture when a new load starts." 2011-12-12 03:13:46 -08:00
Svetoslav Ganov
47730f1582 am 33a3b2ce: am 48b428fb: Merge "NumberPicker getting stuck if scroll wheel not wrapable." into ics-mr1
* commit '33a3b2cecf174cb14097498214131fcfb32ec04c':
  NumberPicker getting stuck if scroll wheel not wrapable.
2011-12-09 18:09:16 -08:00
Gilles Debunne
70511ade47 am b25d417f: am aa4a5713: Merge "Make the Next key navigate between TextViews" into ics-mr1
* commit 'b25d417fce0e0467187ac187a4dabae75d5dc83d':
  Make the Next key navigate between TextViews
2011-12-09 18:09:03 -08:00
Gilles Debunne
2afcfa4239 resolved conflicts for merge of 5371a165 to master
Change-Id: I61830ec96c277ebba9db3e40842597b9c98d53c7
2011-12-09 18:06:34 -08:00
Nick Pelly
1db7a31a45 Merge "Add BluetoothAdapter.getRemoteDevice(byte[])" 2011-12-09 14:37:05 -08:00
Nick Pelly
75596b4545 Add BluetoothAdapter.getRemoteDevice(byte[])
This is useful for NFC->BT hand-over, where we are already working with bytes.

Change-Id: I2fff0b4fa0cefe9bfdf9a13f7ec6f557776a8a03
2011-12-09 14:35:38 -08:00
Gilles Debunne
683a485fbc am aee940df: am a5a98a03: Merge "IOOB is Suggestions" into ics-mr1
* commit 'aee940df55b5d1f769f56ff8a6dd645253b7f8e5':
  IOOB is Suggestions
2011-12-09 14:25:55 -08:00
Gilles Debunne
47a4b78eb7 am 9f4b70c7: am 89f2e8a0: Merge "Prevent NPE in SuggestionSpan" into ics-mr1
* commit '9f4b70c72508077f39a71bb17df265eb883c7a20':
  Prevent NPE in SuggestionSpan
2011-12-09 14:25:53 -08:00
Jeff Brown
bdc18b28eb am 03e63427: am 8e0ecbfc: Merge "Shortcut keys should be handled on down, not up." into ics-mr1
* commit '03e634270d880407316b51fac2278e604fc82703':
  Shortcut keys should be handled on down, not up.
2011-12-09 14:25:41 -08:00
Romain Guy
3f7be830f0 Merge "Enable dirty regions on newly created EGL surfaces" 2011-12-09 12:28:46 -08:00
Romain Guy
9477c6e658 Enable dirty regions on newly created EGL surfaces
This change fixes an issue on some tiler architectures that do not
enable the swap buffer behavior by default on EGL surfaces.

Change-Id: Ibda1ae582da1a20afad3be9c3361080e72df5206
2011-12-09 12:27:21 -08:00
Narayan Kamath
e61fd281a8 Merge "Remove BlockingMediaPlayer." 2011-12-09 06:30:14 -08:00
Gilles Debunne
17994a1d04 Blinking cursor in Talk
I verified that this fixes the unblinking cursor problem in Talk.

Change-Id: I5e3e5c8ad5cf3d8479462495107bf93e5e4fb956
2011-12-08 18:40:27 -08:00
Gilles Debunne
be5f49fb6e Performance improvements for long text edition.
Limit each parse to batches of a few words, to keep the UI thread
responsive.

Possible optimizations for the future:
- SpellCheck in a thread, but that requires some locking mecanism
- Only spell check what is visible on screen. Will require additional
  spans to tag the pieces of text.

This is a cherry pick of 145656 into ICS-MR1

Patch Set 2: Make the Runnable shared and stop it when detached.

Change-Id: Ibf8e98274bda84b7176aac181ff267fc1f1fa4cb
2011-12-08 18:26:49 -08:00