Merge commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94'
* commit '591908fd3fd1a84303bbc76c5c44d5cb0ee0bc94':
Extend unit test framework for Wifi soft AP configuration
Merge commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a' into gingerbread-plus-aosp
* commit '120a58fb80ec9ba5b62e4b7453ea45703d1ce58a':
Extend unit test framework for Wifi soft AP configuration
has marked itself as being an installable web app. Default implementation
in the WebChromeClient does nothing.
Requires an external/webkit change.
b/2766917
Change-Id: I7aae1b097f866e3d1c6c6a7a31a55bb12ff6a441
Merge commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84' into gingerbread-plus-aosp
* commit '059f009d970fb37ac4e408dcf8e1d2d2cdcf0a84':
Make android.hardware.action.USB_STATE a protected broadcast.
Merge commit 'b54ef61434eb82a53d8c840d86d1d656215604f9' into gingerbread-plus-aosp
* commit 'b54ef61434eb82a53d8c840d86d1d656215604f9':
Separate the status bar height from the icon size.
Our use of web settings does not specify the maximum image size,
although we have some hard-coded values used when decoding the
image. For defective images, the hard-coded values are not enough,
since we may exceed memory in the decoder before the limit is
reached.
Pass along our limits to the decoder, and respect any limits
set by the caller.
companion change in external/webkit
Change-Id: Iabd78165390dddce917f637bd3263b83f9b4aa56
http://b/2689053
Merge commit '9be487ce6be705d210d42f8cbe6468226eeb544e'
* commit '9be487ce6be705d210d42f8cbe6468226eeb544e':
Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
Merge commit '606d591afee24e31e3885a7330638893db1710f5' into gingerbread-plus-aosp
* commit '606d591afee24e31e3885a7330638893db1710f5':
Add new Usb.ACTION_USB_STATE sticky broadcast for monitoring USB connect state
Target identification is now fully native.
Fixed a couple of minor issues related to input injection.
Native input enabled by default, can be disabled by setting
WindowManagerPolicy.ENABLE_NATIVE_INPUT_DISPATCH to false.
Change-Id: I7edf66ed3e987cc9306ad4743ac57a116af452ff
Now deals correctly with a content view containing just a list,
and adds a lot more built-in functionality: ability to show
custom text for an empty list, and indeterminant progress while
populating the list.
In addition, reworks transaction committing to be more aggressive
about committing the transactions as the containing activity
moves between its states (rather than waiting for the activity's
handler to process the transaction message whenever that may
finally happen). And fixed a bug with saving/restoring state of
transaction replace operations.
Change-Id: I9617a0c4f248b50a61b319910323639b6de24f73
Merge commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33' into gingerbread-plus-aosp
* commit '9c4c98b1027bbf0b7652a56a1f5614a028a01d33':
new presence icons for video/audio chats.
This can be used instead of ACTION_USB_CONNECTED and ACTION_USB_DISCONNECTED
by clients that need to be informed of both USB connect and disconnect events
Change-Id: Ic26927af2e775c2694d18775f9d574c97b095dfd
Signed-off-by: Mike Lockwood <lockwood@android.com>
This CL also includes some minor changes to the ZoomManager that
make the manager easier to test as well as fix some uncovered issues.
Change-Id: I66a84d70ee75e765ccf9cccb2d123757a9470f93
Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35'
* commit 'cbbc035b640790650d0e377a2d6291cc523a2a35':
Unhide new API for supporting multiple cameras.
Merge commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb' into gingerbread-plus-aosp
* commit 'de1057c4a6aa41c3b88bcc4fd49d70f973f1d9eb':
Unhide new API for supporting multiple cameras.
Even though there's an implementation for textured rects, drawBitmap() is not
hooked up yet as it will require a good texture cache.
This method is implemented using FBOs. There's currently an issue either in the
driver or in the Canvas renderer that forces the FBO to be fullscreen, which is
extremely expensive and yields terrible performance.
Change-Id: I148419195e12d45653c60186938aa78c23a68e2c
Merge commit 'a0a582355ba10454d2625ce2968015e50a12a3e3'
* commit 'a0a582355ba10454d2625ce2968015e50a12a3e3':
Placeholder icons for the "ringing" variant of stat_sys_phone_call.
Merge commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b' into gingerbread-plus-aosp
* commit '01719a22f9e0e0eadfedcfc17b2deb73c5fb3d6b':
Placeholder icons for the "ringing" variant of stat_sys_phone_call.
Merge commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631'
* commit '8b0d5bc3f858ae2b737ac654fa05c439344ad631':
Fixing counting the number of days in call log screen.
