55311 Commits

Author SHA1 Message Date
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
Jaikumar Ganesh
1352531dc7 Merge "Auto Pairing tweaks." 2011-07-21 16:27:55 -07:00
Xavier Ducrohet
55775e5f34 am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit 'e70b2b8fe0c265171f3a367a66c99b36c62567c7':
  Layoutlib_create flag -p: don't change all accesses to public.
2011-07-21 16:25:50 -07:00
Mike Lockwood
a5e9bab0e4 Merge "UsbDeviceManager: Add USB notification string for USB accessory mode" 2011-07-21 16:24:27 -07:00
Mike Lockwood
ae1294cb6b Merge "USB: Fix handling USB accessory attached when device is booting" 2011-07-21 16:24:18 -07:00
Xavier Ducrohet
e70b2b8fe0 am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit '9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
  Layoutlib_create flag -p: don't change all accesses to public.
2011-07-21 16:23:18 -07:00
John Reck
8afdd412ac Merge "Fixup handling destroy" 2011-07-21 16:21:13 -07:00
Dianne Hackborn
c09bd156b7 Merge "Fix bug where memory trim was not being delivered with correct level." 2011-07-21 16:19:11 -07:00
Xavier Ducrohet
9bcf26ea7a Merge "Layoutlib_create flag -p: don't change all accesses to public." 2011-07-21 16:17:03 -07:00
Fabrice Di Meglio
b72dedfa5e Merge "Fix CheckTextView padding" 2011-07-21 16:12:43 -07:00
Adam Powell
038f1c80af Bug 5061529 - Save/restore action view state for menu items across
invalidations.

This includes expand/collapse state.

Add CollapsibleActionView interface. Views can implement this to have
special behavior when they are presented as an expanding/collapsing
action view. This lets SearchView and others take care of fiddly
behavior (focus stealing; opening the IME) automatically without apps
needing to implement this themselves.

Change-Id: Ibbd1eb5fcf3e3a862419e9344ad50f896bd05e36
2011-07-21 16:10:01 -07:00
Dianne Hackborn
f0754f5ba7 Fix bug where memory trim was not being delivered with correct level.
Also improve how we handle services, keeping track of whether they showed
UI and if so putting them immediately on the LRU list.

Change-Id: I816834668722fc67071863acdb4a7f427a982a08
2011-07-21 16:02:56 -07:00
Chris Craik
b4cd566767 Merge "New log format, Manual log generation, plus logging of invalidates" 2011-07-21 15:59:17 -07:00
Jeff Hamilton
6675ae11d5 Merge "Make READ_FRAME_BUFFER signatureOrSystem." 2011-07-21 15:57:41 -07:00
Chia-chi Yeh
6abf39879a VPN: add VpnBuilder as the public API of user space VPN.
Change-Id: I5d30cf592bead315509038632647c88de5060e50
2011-07-21 15:37:16 -07:00
Makoto Onuki
85a01a6b46 Add new contacts intent action for the "invite" feature
Bug 5061956

Change-Id: Iaf9926108db51adb3a8742130b1f0418186090c2
2011-07-21 15:37:12 -07:00
Mike Lockwood
6e680dea3b UsbDeviceManager: Add USB notification string for USB accessory mode
Bug: 5062341

Change-Id: I93af8274e538009dd8f00d1cea782b62334e43f1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-21 15:36:09 -07:00
Romain Guy
6ee8c2495d Merge "Add looper profiling to adb shell am" 2011-07-21 15:31:59 -07:00
Gilles Debunne
c40c65a732 Minor dash typos in documentation
Change-Id: Ie0cbe870d4595dc566720a99f7604cb8365d8ffd
2011-07-21 15:25:41 -07:00
Fabrice Di Meglio
aff599b4ab Fix CheckTextView padding
- fix for bug #5051724 and bug #5051674
- override resolvePadding for doing correct padding resolution

Change-Id: Id8c7bf4afa24ff2169fd1bd7f5024a342279aab2
2011-07-21 15:24:09 -07:00
Romain Guy
7eabe55db6 Add looper profiling to adb shell am
To profile the looper, run the following command:

adb shell am profile looper start <process> <file>
adb shell am profile looper stop <process>

Change-Id: I781f156e473d7bdbb6d13aaffeeaae88bc01a69f
2011-07-21 14:56:34 -07:00
Mathias Agopian
45b63dd11c Fix a few issues with NATIVE_WINDOW_TRANSFORM_HINT
- fixed uninitialized variable
- set hint to indentity when transform is too complex
- make sure FrameBufferNativeWindow doesn't fail on needed perform commands

Bug: 4487161
Change-Id: I7cb2b0869b72404732eca7cb2d145ff669e2ed9b
2011-07-21 14:50:29 -07:00