55332 Commits

Author SHA1 Message Date
Gilles Debunne
d3bb7893fb Merge "Minor dash typos in documentation" 2011-07-22 09:24:31 -07:00
Jesse Wilson
d1ad3c2c3a Fix benign off-by-one in JsonReader.
The bug would have caused us to call fillBuffer() earlier than
necessary.

Change-Id: Ib0e4e54019394d7085913faf90c495d130e8bb75
2011-07-22 09:01:48 -07:00
Andreas Huber
178e8eb5dd Retry datasource fetches a few times before giving up (NuCachedSource2).
Change-Id: I147fc18ef55bc89d2e2fee69b7869c45abbfdd6b
related-to-bug: 3405354
2011-07-22 08:17:41 -07:00
Daisuke Miyakawa
40c4321df4 Merge "Introduce hidden API Contacts.CONTENT_FREQUENT_URI" 2011-07-22 08:05:55 -07:00
satok
3263f02b3e Merge "Delay load the settings for the ongoing ime swither" 2011-07-22 04:11:49 -07:00
satok
b858c732f6 Delay load the settings for the ongoing ime swither
Bug: 5029803
Change-Id: I488ff7804a986b71bf01b3dfad0e65fd4707965d
2011-07-22 19:54:34 +09:00
satok
3de3d6ad58 Fix the vendor build.
Change-Id: I856057c9418fd5194d78e34c4496bd43c520546f
2011-07-22 15:50:22 +09:00
satok
7793719ca9 Merge "Create TextServiceManager and SpellCheckerService" 2011-07-21 22:59:48 -07:00
satok
988323c57b Create TextServiceManager and SpellCheckerService
Bug: 4176026

This CL inherits https://android-git.corp.google.com/g/112600

Spec of TextServiceManager
- Chooses the most applicable TextService(e.g. SpellCheckerService, WordBreakIteratorService..)
    for each locale

Spec of SpellCheckerService
- Returns whether the given string is a correct word or not
- Returns Suggestions for the given string

Change-Id: Iaa425c7915fe70767ad0b17bf6c6fbcd2a1200b2
2011-07-22 14:52:21 +09:00
Dianne Hackborn
20bf46af14 am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit 'b0878223db87700cdc988a6d9197ca4e3c4772db':
  frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:37:13 -07:00
Dianne Hackborn
b0878223db am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '6800a80199477c90fc64af7211a177de06478a02':
  frameworks/base: Cap the number of toasts that a package can post.
2011-07-21 22:35:32 -07:00
Dianne Hackborn
9ce1ecdfde am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
  frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:26:20 -07:00
Dianne Hackborn
1a2fcea1a2 am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
  frameworks/base: unlink death notifications of Vibrate requests
2011-07-21 22:23:46 -07:00
Dianne Hackborn
6800a80199 Merge "frameworks/base: Cap the number of toasts that a package can post." 2011-07-21 22:21:19 -07:00
Dianne Hackborn
2f4698fda4 Merge "frameworks/base: unlink death notifications of Vibrate requests" 2011-07-21 22:18:47 -07:00
Dianne Hackborn
4ac052688a Merge "Fix issue #5061083: Handler.removeCallbacksAndMessages..." 2011-07-21 21:53:19 -07:00
Eric Laurent
095086111f Fix issue 4988574: 8 bit PCM audio playback broken.
Fixed regression in audio track control block frame size
calculation introduced by commit c310dcb.

Change-Id: Ia731b946ae4e43316b98d80229e3b08a696e47d6
2011-07-21 21:00:46 -07:00
Mathias Agopian
672a05f0cf Merge "Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT" 2011-07-21 20:34:47 -07:00
Michael Jurka
e224d4f0b7 Merge "Prevent notification swipes from getting canceled too soon." 2011-07-21 19:57:54 -07:00
Daniel Sandler
521efd8886 Prevent notification swipes from getting canceled too soon.
The scroll view was grabbing the gesture as soon as its dy
crossed the scroller's own slop threshold. Once we detect a
horizontal swipe-to-clear we request that the scroller no
longer activate until the gesture is over.

Bug: 4998677
Change-Id: If916fc00d155516e0e4bfe8c2df19827a2f16fe6
2011-07-21 22:37:09 -04:00
Adam Powell
6c8519cf40 Merge "Fix bug 5037537 - Revert "ListView focus bugfix."" 2011-07-21 19:33:26 -07:00
Daniel Sandler
44b578aa4a Merge "Subtract the navbar's bounds from fullscreen windows." 2011-07-21 19:05:35 -07:00
Svetoslav Ganov
610d1f1fae DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
CHERRY PICK FROM MASTER

1. AccessibilityInjectorTest changes the key bindings and when done
   restores the defatult ones. The restoreation was not working.

bug:4905620

Change-Id: I812bad0b748637ded0ce69ace12517511f62f726
2011-07-21 18:53:47 -07:00
Dianne Hackborn
78ede2c898 Merge "Move status bar above keyguard." 2011-07-21 18:51:45 -07:00
JP Abgrall
b6055fe747 Merge "NetworkManagementService: receive bandwidth controller events" 2011-07-21 18:44:52 -07:00
Adam Powell
fc302cdeed Fix bug 5037537 - Revert "ListView focus bugfix."
This reverts commit a86127fe265896136d2e70273b7623e7c765fe2e.
2011-07-21 18:43:12 -07:00
Adam Powell
f726c1de8b Fix doc breakage
Change-Id: I2311a97b626fda105b635b70885b17fdee53f8d2
2011-07-21 18:38:40 -07:00
Adam Powell
7ebb0bb157 Merge "Bug 5061529 - Save/restore action view state for menu items across invalidations." 2011-07-21 18:22:02 -07:00
Kazuhiro Ondo
3372c1ef78 am b7ad442c: am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit 'b7ad442c90146f736c6268c21e34a87fbcab6335':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:19:21 -07:00
Dianne Hackborn
466ed24810 Fix issue #5061083: Handler.removeCallbacksAndMessages...
...implementation doesn't match documentation

Fix the documentation.

Change-Id: I995b88e0f510973eb7d815ae895059e325c30e10
2011-07-21 18:17:45 -07:00
Kazuhiro Ondo
b7ad442c90 am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
2011-07-21 18:15:26 -07:00
Pannag Sanketi
fb7c0ce35e Merge "Adding AndoirdOpaque Colorformat to OMX" 2011-07-21 18:11:00 -07:00
Romain Guy
9cbd934b3c Merge "Ouput looper traces as traceview traces" 2011-07-21 18:07:16 -07:00
Dianne Hackborn
71baf1d82d Move status bar above keyguard.
This is to make it possible to pull down the notification shade
while in the keyguard.

I tried a quick test and I don't see anything horrendously broken,
but who knows what kind of subtle layering issues may result.

Change-Id: I70107a18588fd3e61dd17dec407911c2f6c9e585
2011-07-21 18:05:11 -07:00
Romain Guy
9a8c5cefca Ouput looper traces as traceview traces
Change-Id: I96c8e85fd7497d970febbf6f5aefc4ab903add8e
2011-07-21 18:04:29 -07:00
Dianne Hackborn
f2b4cedd77 Merge "Fix issue #5021385: Title of any Settings subscreen changes..." 2011-07-21 17:53:51 -07:00
Jeff Brown
08695111cf Merge "Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList. Bug: 5062011" 2011-07-21 17:44:08 -07:00
James Dong
ce78dc5baa Log setVideoSurface() and setVideoSurfaceTexture() failures.
Change-Id: Iaea34e74a0cf569fc85b926949253dea6baa6142
related-to-bug: 5063370
2011-07-21 17:38:18 -07:00
Chia-chi Yeh
45db96d08a Merge "VPN: add VpnBuilder as the public API of user space VPN." 2011-07-21 17:37:11 -07:00
Adam Powell
ff3dbe0817 Merge "Fix bug 5048482 - mischievous monkeys editing text in IME extract mode" 2011-07-21 17:33:00 -07:00
Dianne Hackborn
34905a9808 Fix issue #5021385: Title of any Settings subscreen changes...
...to "Settings" when orientation changes

Change-Id: Ib6387b9813329174013452bcdf323cedc4b29664
2011-07-21 17:30:57 -07:00
Adam Powell
d06caed8d6 Fix bug 5048482 - mischievous monkeys editing text in IME extract mode
Change-Id: I0bb8d85bc6fdb52c718dca99d69a1571bd64c517
2011-07-21 17:29:24 -07:00
Jeff Brown
162a021756 Decouple GLES20RecordingCanvas lifetime from GLES20DisplayList.
Bug: 5062011

Previously, each GLES20DisplayList would hold onto an instance of
GLES20RecordingCanvas.  In turn, each GLES20RecordingCanvas
held onto an SkWriter with a 16Kb buffer along with several other
objects.  With one display list per view and hundreds of views,
the overhead could add up to a few megabytes.

Ensured that the GLES20RecordingCanvas is reset as soon as
the display list has been constructed, thereby promptly freeing
the 16Kb buffer.

Changed GLES20DisplayList so that it acquires a GLES20RecordingCanvas
from a pool as needed and recycles it when done.

Removed some dead code and cruft related to the construction of
GLES20Canvas objects in general.  Some code was written with the
assumption that the underlying renderer object could change
behind the scenes or might be lazily constructed, but that isn't
actually the case so we can simplify things.

Removed an unnecessary weak reference from GLES20DisplayList
to the View.  It isn't actually used anywhere.

Fixed a bug in GLES20DisplayList where isValid() would return
true while the display list was being recorded.  This is incorrect
because the native display list might not actually exist.  Worse,
even if the native display list does exist, it is stale and
potentially refers to old Bitmaps that have been GC'd (because the
mBitmaps list was cleared when recording started).

Change-Id: Ib12d5483688cb253478edeb0156d34c476c2566b
2011-07-21 17:15:48 -07:00
Michael Jurka
ec89a2b606 Merge "Fix crash in recents" 2011-07-21 17:13:13 -07:00
Pannag Sanketi
f48987db67 Renaming SurfaceEncoder to SurfaceMediaSource
Related to bug id: 4529323

Change-Id: Id820d45a536bd2c65e0a59def564eb5b3ea4a71c
2011-07-21 17:12:50 -07:00
Pannag Sanketi
26a197120c Adding SurfaceEncoder for encoding FilterFrames
Adding SurfaceEncoder which can be used to encode
custom frame data. In a sense, it is reverse
of what SurfaceTexture does.

SurfaceEncoder takes in frames from a native window and
passes them to an encoder, thus acting like a MediaSource.
It uses GRAlloc buffers underneath for passing data.
The client side sets the geometry, format in the beginning,
which cannot be changed while the recording is going on.

Currently, there is no common pixel format that both
GRAlloc and HAL understand.
Also, the encoder cannot encode using the data from the GRAlloc
buffers.

The SurfaceEncoder_test examines mainly the buffer passage
since true encoding cannot be done at this point.
SimpleDummyRecorder 'reads' the frames in the same thread
as the start(), whereas DummyRecorder 'reads' in a separate
thread much like the MPEG4Writer. The test with DummyRecorder
is much closer to the real encoding implementation.

Related to bug id: 4529323

Change-Id: I58ec19a150f8fe4d6195196dc44f55002b46c7c8
2011-07-21 17:12:50 -07:00
Pannag Sanketi
348c45bd96 Adding AndoirdOpaque Colorformat to OMX
Adding an enum to indicate an android opaque OMX
colorformat. This will inform the encoder that
the actual colorformat will be relayed by the
Frames read from the GRAlloc Buffers

Related to bug id: 4529323

Change-Id: Iddc5bd1ce8ca2b2506a57aadf5fc91ff0c7b78ef
2011-07-21 17:12:49 -07:00
Michael Jurka
d4ae1de0d0 Fix crash in recents 2011-07-21 17:10:21 -07:00
John Wang
1a15b03f62 Merge "Remove APN type in notifyDataConnection." 2011-07-21 17:06:08 -07:00
Kazuhiro Ondo
1c82f56f24 Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
Fix to resolve conflicting ERI and CSIM SPN. CSIM SPN should be
only used when camping SID/NID is listed in CDMAHOME record.

Bug: 5057486
Change-Id: I6c5961bb53cc6257237fa5a93a0acd067b12d009
2011-07-21 17:04:58 -07:00