74475 Commits

Author SHA1 Message Date
Jeff Brown
cc11698319 HID usage should take precedence over scan code.
Change-Id: Ibd8988e3dcc0d64f4019ffe491d9789733f9d243
2012-04-12 10:05:41 -07:00
Jeff Brown
49ccac530b Refactor key code mapping.
Added handling for EV_MSC / MSC_SCAN which typically reports
the HID usage associated with a key.  This will enable key maps
to map keys with HID usages that Linux does not natively recognize.

Removed keyCode and flags fields from EventHub RawEvent since
they don't necessarily make sense in isolation now that we
pay attention to HID usage codes too.

Removed the fallback code for mapping keys and axes.  In practice,
an input device should be self-sufficient.  We should not ever
need to look at the built-in keyboard's key map.  In fact, there
usually isn't a built-in keyboard anyhow.  This code was originally
working around a problem where we weren't loading the key map
for touch screens with virtual keys, which has long since been fixed.

Change-Id: I0a319bdec44be9514f795526347397e94d53a127
2012-04-11 20:28:09 -07:00
Adam Powell
db13a6bf78 Merge "Invalidate for scrolling animations on the animation timer" 2012-04-11 15:22:37 -07:00
Jeff Brown
cdebd54805 Merge "Don't do anything on lid state change by default." 2012-04-11 15:19:41 -07:00
Jeff Brown
879392fe31 Merge "Unhide new animation runnable API on View." 2012-04-11 15:19:31 -07:00
Jeff Brown
2e7760eba0 Don't do anything on lid state change by default.
Because a lid switch can be used to do many things, it's best
if the framework does not do anything by default when the lid is
opened or closed.  The behavior of the lid switch should be
configured on a per-product basis in a config.xml resource overlay.

Bug: 6320088
Change-Id: I9f768dd11d76c3c17c49f46c92f993ee2ff1409f
2012-04-11 15:14:55 -07:00
Chet Haase
f57eb43b00 Merge "Pass width/height parameters to webview" 2012-04-11 14:54:12 -07:00
Chet Haase
7b6a75872b Pass width/height parameters to webview
When webview draws into an fbo layer, it needs to know the
size of that surface to create the rendering transform appropriately.
This change copies in the current viewport size to the structure that
is passed to the webview.

Change-Id: I7160b0836d00834134c799c95a439cdc045e2035
2012-04-11 14:32:02 -07:00
Chris Craik
cae80b2563 Merge "Unify composited layer/base layer draw path" 2012-04-11 14:26:11 -07:00
Jeff Brown
4d6a82d79e Unhide new animation runnable API on View.
Change-Id: Id626688d6c7d632c01d9897777c854cb601d3301
2012-04-11 14:23:51 -07:00
Eric Fischer
0a1c6c8bc7 Merge "Import translations. DO NOT MERGE" 2012-04-11 13:34:04 -07:00
Eric Fischer
e14d679f76 Merge "Import translations. DO NOT MERGE" 2012-04-11 13:31:55 -07:00
Adam Powell
df3ae4f3ae Invalidate for scrolling animations on the animation timer
Change View methods awakenScrollBars and scrollTo to post their
invalidation on the animation timer. Since these are often used in
computeScroll or similar to continue scrolling or flinging it should
not prevent other posted events from being processed before the frame
is actually drawn. (All changes in scroll position, etc. are
immediately reflected after the calls and do not need a draw to
present correct data about scroll position to apps.)

Don't accumulate floating point error while dragging
ScrollView/HorizontalScrollView.

Change-Id: I05b57d75f89a806488e46a8fb79b85d80f56d45d
2012-04-11 13:01:24 -07:00
Eric Fischer
f320645b6d Import translations. DO NOT MERGE
Change-Id: I165a1adbaf48551ff98259bf3878de6373b7f9af
2012-04-11 12:57:23 -07:00
Scott Main
7e6ee74ac4 am 4e53730b: am f1e17d8d: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '4e53730b12f47c4dec98c86a2d293a48ac9787c5':
2012-04-11 12:55:55 -07:00
Scott Main
4e53730b12 am f1e17d8d: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit 'f1e17d8d47cf7746452e6e4b632209773bdd366c':
2012-04-11 12:47:40 -07:00
Eric Fischer
31512821ce Import translations. DO NOT MERGE
Change-Id: I0ccad7d90521504398872d516201309a5198b67f
2012-04-11 12:42:59 -07:00
Amith Yamasani
cc43a7216f Merge "Fix a race condition in SyncManager.onAccountsUpdated()" 2012-04-11 12:17:01 -07:00
Stephen Hines
f99f0c3027 Merge "Add tests for rootn() to math_conformance." 2012-04-11 11:51:09 -07:00
Scott Main
aac7f0afc5 am 047b8f3c: am 06874425: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '047b8f3ccc280914defc35049d029d5b92a07269':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:41:27 -07:00
Scott Main
047b8f3ccc am 06874425: am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '068744258bce3fa5f47aa40f591793bbfa006613':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:38:21 -07:00
Scott Main
f1e17d8d47 am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '71e8f4c152a84ff420dcf834bc0acd73644f0cb0':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:35:52 -07:00
Scott Main
068744258b am 71e8f4c1: Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1
* commit '71e8f4c152a84ff420dcf834bc0acd73644f0cb0':
  docs: add 101 class about intents, Interacting with Other Apps
2012-04-11 11:34:29 -07:00
Scott Main
71e8f4c152 Merge "docs: add 101 class about intents, Interacting with Other Apps" into ics-mr1 2012-04-11 11:32:40 -07:00
Jeff Brown
d1f3de40ba Merge "Be more careful about exceptions in input callbacks." 2012-04-11 10:52:17 -07:00
Amith Yamasani
f29f2369cf Fix a race condition in SyncManager.onAccountsUpdated()
Get the full list of accounts from AccountManagerService in one shot
instead of getting them per user.

Bug: 6263091

Change-Id: I488f24749a96281ef1e2a620820399c97f471024
2012-04-11 10:29:18 -07:00
Amith Yamasani
50a926789f Merge "Bind to the correct face lock service." 2012-04-11 10:24:20 -07:00
Craig Mautner
b414812549 Merge "Check for existing dimming before stop dimming." 2012-04-11 09:35:05 -07:00
Craig Mautner
f8d4fbb9c8 Check for existing dimming before stop dimming.
Add a test to make sure that we are dimming before we send the message
to stop it. This prevents a CPU consuming loop when dimming is already on.

Fixes bug 6320003.

Change-Id: If26dc5b0800300d8e38c166824651223eded4cfa
2012-04-11 09:25:53 -07:00
Daniel Sandler
3bf928d51e Merge "Fix PowerMgr NPE on emulator." 2012-04-11 07:03:00 -07:00
satok
8d33d39d68 Merge "Show physical keyboard control button on the input method switch dialog" 2012-04-11 00:12:59 -07:00
satok
01038492ff Show physical keyboard control button on the input method switch dialog
Bug: 5240095
Change-Id: Ica768083f95c33dc1e494a28ba7d8b6eb989b0ef
2012-04-11 15:49:35 +09:00
Jeff Brown
3bdcdd8531 Be more careful about exceptions in input callbacks.
consumeEvents() may be called reentrantly so we need to be
careful when handling exceptions.  When called directly
through JNI, the exception should be allowed to bubble up
to the caller.  When called from a Looper callback, the
exception should be recorded on the MessageQueue and bubbled
when the call to nativePollOnce() returns.

Bug: 6312938
Change-Id: Ief5e315802f586aa85af7eef1bd6e9bea4ce24ab
2012-04-10 20:36:07 -07:00
Stephen Hines
72afa117b7 Add tests for rootn() to math_conformance.
BUG=6319010

Change-Id: I3fa7d688e6f3b66f51a1c25a2c2104b659691c8b
2012-04-10 20:15:47 -07:00
Jeff Brown
9f25b7fdf2 Request key maps from input manager service.
Instead of each application loading the KeyCharacterMap from
the file system, get them from the input manager service as
part of the InputDevice object.

Refactored InputManager to be a proper singleton instead of
having a bunch of static methods.

InputManager now maintains a cache of all InputDevice objects
that it has loaded.  Currently we never invalidate the cache
which can cause InputDevice to return stale motion ranges if
the device is reconfigured.  This will be fixed in a future change.

Added a fake InputDevice with ID -1 to represent the virtual keyboard.

Change-Id: If7a695839ad0972317a5aab89e9d1e42ace28eb7
2012-04-10 18:23:58 -07:00
Mangesh Ghiware
54ae14749b Merge "On double-tap, simply zoom in if content is too wide." 2012-04-10 18:00:06 -07:00
Adam Powell
b874e5ba81 Merge "Avoid potential leaks with Runnables posted from ProgressBar" 2012-04-10 17:58:25 -07:00
Adam Powell
a050663feb Avoid potential leaks with Runnables posted from ProgressBar
Bug 6093695

Handle pending progress updates when a view is not attached when the
view becomes attached again. Batch pending progress updates together
rather than posting separate runnables for each.

Change-Id: I5dea671d5b9fbe1302912ca4734a63955e77ff4d
2012-04-10 17:52:13 -07:00
Mangesh Ghiware
518e83b8c6 On double-tap, simply zoom in if content is too wide.
Bug: 6257654
Change-Id: I6963476300619d6f0d6af46630f9a86d95ad0dfc
2012-04-10 17:42:49 -07:00
Chris Craik
00ed0fd27f Unify composited layer/base layer draw path
Multiple paths were redundant, as they both synchronized the layers, and drew
the base if needed.

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

Change-Id: I1c355510f6edda4631190f2d26df8171e795a6ac
2012-04-10 17:29:35 -07:00
Dan Morrill
4527a92421 Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole." 2012-04-10 17:13:17 -07:00
Dianne Hackborn
9944ecd28e Hide the callback for activity animation options.
Not something I want to be stuck reporting forever.

Change-Id: Iab13fb7abb23d466492230242bfbae29f1fd01f3
2012-04-10 15:54:19 -07:00
Dianne Hackborn
2a854c13f8 Merge "Some small tweaks to improve memory management." 2012-04-10 15:25:43 -07:00
Robert Ly
4245ab34d1 am 82321d1f: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
* commit '82321d1fbfdd544225ca063a1d43a3a9c53ea5df':
2012-04-10 15:13:41 -07:00
Amith Yamasani
f882f1ad4e Bind to the correct face lock service.
When switching users, bind to the correct instance of FaceLock.

Tried to get the facelock screen to show up when switching users, but it
doesn't. Power off/on works, but not switching between users on the
lockscreen. Maybe a timing issue? Or not calling some function to make
the overlay visible?

Change-Id: I9300971331c7f0ed93ae7da28170342629426b20
2012-04-10 15:13:39 -07:00
Robert Ly
9ec0746bbb am 2ce5444d: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit '2ce5444d638e9504521e155ffdbb363f88cdc534':
2012-04-10 15:13:39 -07:00
Robert Ly
5f9b286f5b am c4bbc7b4: am 876b7b87: Merge "docs: fixing renderscript doc bug 6111834" into ics-mr1
* commit 'c4bbc7b4e44c2292d1fdfc7fa4cfac6a55fc3da9':
2012-04-10 15:13:37 -07:00
Android Git Automerger
3b5966b069 am d1ba6895: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp
* commit 'd1ba68955947c208831711efdf2d6c4e5fb86d84':
2012-04-10 15:09:20 -07:00
Robert Ly
97dbfc7ae3 am bc8eaa7d: am 11d33b3d: am 23f08c6d: Merge "docs: fixing broken link for bug 6104366" into ics-mr1
* commit 'bc8eaa7d63865ee2532014419a0e384c62c7027e':
2012-04-10 15:09:13 -07:00
Robert Ly
5df9ad98b6 am 030c8614: am b3f7fc2f: am 2e9dac4b: Merge "docs: fixing ndk bug 5991108" into ics-mr1
* commit '030c86145a011dc20012f2a63aa0da6e365c50b2':
2012-04-10 15:09:11 -07:00