Merge commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df'
* commit 'fd28b45125f7d58a9d88c0dd09fe610f6e5878df':
Another attempt at popup assets (hdpi and mdpi)
Merge commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a'
* commit '9f6d18cadf9ac50062063f5f5ff5de7f6895696a':
[3095807] screen takes a long time to turn on
Merge commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429'
* commit '9bb8e5cc3e9f8ae2c46967ee1fd422f3bf1e9429':
Test that we don't leak sensitive information when logging cookies.
Merge commit 'a8faf91fa558be1235d508e776eb24be4429585c'
* commit 'a8faf91fa558be1235d508e776eb24be4429585c':
fix [3095607] Gingerbread screen turn-on animation does not show the last frame
* Increase the opacity of the drag thumbnail a bit
* Properly present window-local drag locations; this fixes drags into
the status bar
* Pass the current drag touch point in DRAG_STARTED. This may
be reconsidered, but might conceivably be useful to someone.
Change-Id: I77690e82e9831ed6be412990c1c9da92e700a501
Manual merge from Gingerbread.
This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.
Bug: 3098519
Change-Id: Id876736fd8bf332ff9a5428bde59f5268aa49c3a
Added new key maps for external keyboards. These maps are intended to
be shared across devices by inheriting the "keyboards.mk" product
makefile as part of the device's product definition.
One of the trickier changes here was to unwind some code in
MetaKeyKeyListener that assumed that only the low 8 bits of the meta key
state were actually used. The new code abandons bitshifts in favor
of simple conditionals that are probably easier to read anyways.
The special meta key state constants used by MetaKeyKeyListener
are now (@hide) defined in KeyEvent now so as to make it clearer that they
share the same code space even if those codes are not valid for KeyEvents.
The EventHub now takes care of detecting the appropriate key layout
map and key character map when the device is added and sets system
properties accordingly. This avoids having duplicate code in
KeyCharacterMap to probe for the appropriate key character map
although the current probing mechanism has been preserved for legacy
reasons just in case.
Added support for tracking caps lock, num lock and scroll lock and
turning their corresponding LEDs on and off as needed.
The key character map format will need to be updated to correctly support
PC style external keyboard semantics related to modifier keys.
That will come in a later change so caps lock doesn't actually do
anything right now except turn the shiny LEDs on and off...
Added a list of symbolic key names to KeyEvent and improved the toString()
output for debug diagnosis. Having this list in a central place in the
framework also allows us to remove it from Monkey so there is one less
thing to maintain when we add new keycodes.
Bug: 2912307
Change-Id: If8c25e8d50a7c29bbf5d663c94284f5f86de5da4
Merge commit '3d4a9774ced0c704da455c5bd9989127e90ba133'
* commit '3d4a9774ced0c704da455c5bd9989127e90ba133':
may fix 3097381 and 3097482. don't abort on/off if the animation fails
Merge commit '4fa7f4f4963568258a6b4179176de8386cb5d3db'
* commit '4fa7f4f4963568258a6b4179176de8386cb5d3db':
Really leave text selection mode when using the trackball.
Merge commit 'f3a935f6aa421110c7b6f36f922223c195f751bc'
* commit 'f3a935f6aa421110c7b6f36f922223c195f751bc':
Make SipService listen to WIFI state change events.
