76176 Commits

Author SHA1 Message Date
Adam Powell
53dc75339a am a60ce985: am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev
* commit 'a60ce9859366b66bcec2a16414abbd670d988de1':
  API modifications for TaskStackBuilder
2012-05-01 19:17:28 -07:00
Jeff Brown
140651b3a0 am 8802ef02: am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev
* commit '8802ef02cb2ccb96ef46c9b2d76fa496b484ccfc':
  Use EVIOCSCLOCKID correctly.
2012-05-01 19:14:43 -07:00
Adam Powell
a60ce98593 am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev
* commit '39f412d8deed2ba46153c8a819bc8635979cec6b':
  API modifications for TaskStackBuilder
2012-05-01 19:14:35 -07:00
Jeff Brown
8802ef02cb am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev
* commit '69387f432d54f117ea7effa691925a3b918246e4':
  Use EVIOCSCLOCKID correctly.
2012-05-01 19:11:48 -07:00
Adam Powell
39f412d8de Merge "API modifications for TaskStackBuilder" into jb-dev 2012-05-01 19:10:32 -07:00
Jeff Brown
69387f432d Merge "Use EVIOCSCLOCKID correctly." into jb-dev 2012-05-01 19:09:44 -07:00
Adam Powell
f78a8444a9 API modifications for TaskStackBuilder
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
2012-05-01 18:51:40 -07:00
Jeff Brown
92f29230ed am c3cca664: am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev
* commit 'c3cca66404571454ee13b341925fe45efd5036e6':
  Improve handling of built-in keyboard.
2012-05-01 18:44:02 -07:00
Jeff Brown
a75fe05b6e Use EVIOCSCLOCKID correctly.
Bug: 6382031
Change-Id: I87b0887ce867a79758bcd24e2202280270faaf8c
2012-05-01 18:41:26 -07:00
Jeff Brown
c3cca66404 am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev
* commit '0632b35b6828cd4324b3d218c2e38f895e819aad':
  Improve handling of built-in keyboard.
2012-05-01 18:41:00 -07:00
Jeff Brown
0632b35b68 Merge "Improve handling of built-in keyboard." into jb-dev 2012-05-01 18:39:00 -07:00
Svetoslav Ganov
bbc0f41d40 am 48661a65: am 5a00661b: Accessibility focus should not affect the currently active window.
* commit '48661a65a945367cfc65cbb4b7b39dd0cec92627':
  Accessibility focus should not affect the currently active window.
2012-05-01 18:35:02 -07:00
Svetoslav Ganov
48661a65a9 am 5a00661b: Accessibility focus should not affect the currently active window.
* commit '5a00661bd6a1bfe82656c51d23a3ac6be99602a2':
  Accessibility focus should not affect the currently active window.
2012-05-01 18:32:05 -07:00
Svetoslav Ganov
5a00661bd6 Accessibility focus should not affect the currently active window.
1. The event of setting an accessibility focus on a view should not
   make the host window the currently active one.

bug:6400648

Change-Id: Ib45c255f441c38489ee9d4ab5f284550ac5f6b01
2012-05-01 18:16:20 -07:00
Tsu Chiang Chuang
40b97d4634 Merge "App Compatibility test. Launches a given app and detects crashes or ANRs." 2012-05-01 17:39:22 -07:00
Tsu Chiang Chuang
fea39c3755 App Compatibility test. Launches a given app and detects crashes or ANRs.
Change-Id: I504868ca2b7785849960be287b8d92ca3055b9ff
2012-05-01 17:30:09 -07:00
Jeff Sharkey
8c64376bf9 am 7534e4b0: am 19eaf0a7: Merge "Catch CCE when migrating to ClipData." into jb-dev
* commit '7534e4b0ba85e9027f0a6e192a8dcd9d1699d7fa':
  Catch CCE when migrating to ClipData.
2012-05-01 16:37:19 -07:00
Jeff Sharkey
7534e4b0ba am 19eaf0a7: Merge "Catch CCE when migrating to ClipData." into jb-dev
* commit '19eaf0a74dc4521db4c248504ea1815d052c0b27':
  Catch CCE when migrating to ClipData.
2012-05-01 16:34:54 -07:00
Eric Laurent
50c07796aa am 5518ab06: am f3afe157: Merge "AudioManager: deprecate vibrate settings" into jb-dev
* commit '5518ab0649693e59dc76ed0453629ee7fff324f2':
  AudioManager: deprecate vibrate settings
2012-05-01 16:34:33 -07:00
Jeff Brown
daa3753a04 Improve handling of built-in keyboard.
The window manager policy made some incorrect assumptions about the
meaning of the Configuration.keyboard field.  We need to be more
careful about distinguishing between built-in and external keyboards.

Most of this change is to move the determination of the parts of
the Configuration related to input devices into the WindowManagerService
leveraging new features of the InputManagerService to good effect.

Then we plumb through the flag that indicates whether a device
is internal or external so that we can be more particular about
how the lid switch effects changes to the Configuration.

Bug: 6424373
Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
2012-05-01 16:34:20 -07:00
Jeff Sharkey
19eaf0a74d Merge "Catch CCE when migrating to ClipData." into jb-dev 2012-05-01 16:32:38 -07:00
Eric Laurent
5518ab0649 am f3afe157: Merge "AudioManager: deprecate vibrate settings" into jb-dev
* commit 'f3afe15754a3ffbc41955476081c3a29adaf32f3':
  AudioManager: deprecate vibrate settings
2012-05-01 16:32:20 -07:00
Eric Laurent
f3afe15754 Merge "AudioManager: deprecate vibrate settings" into jb-dev 2012-05-01 16:29:39 -07:00
Philip Milne
4fdae05fdd am 6b36d0d0: am 3e350304: Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev
* commit '6b36d0d044964cf133cb2cc6b5b62756d441045f':
  Fix for layout parameter validation bug in GridLayout.
2012-05-01 16:27:58 -07:00
Eric Laurent
cd1cd73bae AudioManager: deprecate vibrate settings
Deprecate methods, intent and constants related to vibrate
settings management: getVibrateSetting(), setVibrateSetting(),
shouldVibrate() ...

According to new vibrate/notification policy, applications should
maintain their own vibrate settings.

Issue 6036529.

Change-Id: I99bcef2c5f602131f1d9b0222f7fb39f3bbef823
2012-05-01 16:26:04 -07:00
Philip Milne
6b36d0d044 am 3e350304: Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev
* commit '3e350304599eeb627065de75f3bfe3a45f58389e':
  Fix for layout parameter validation bug in GridLayout.
2012-05-01 16:24:46 -07:00
Gilles Debunne
6b31eab905 am 6b578dc3: am 61552bc8: Merge "API fix in CheckedTextView" into jb-dev
* commit '6b578dc30cab9f85d3b111920a1e4390e5482c8a':
  API fix in CheckedTextView
2012-05-01 16:24:19 -07:00
Gilles Debunne
6b578dc30c am 61552bc8: Merge "API fix in CheckedTextView" into jb-dev
* commit '61552bc81f9f0c1aacbeec694ff97978050c6182':
  API fix in CheckedTextView
2012-05-01 16:22:23 -07:00
Philip Milne
3e35030459 Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev 2012-05-01 16:21:15 -07:00
Gilles Debunne
61552bc81f Merge "API fix in CheckedTextView" into jb-dev 2012-05-01 16:19:40 -07:00
Chris Craik
a352de1c10 am 272a51d1: am ad759f95: Merge "fix monkey scrolling crash" into jb-dev
* commit '272a51d1bedfea5c0c27c2b5d34fe8afe55acfa9':
  fix monkey scrolling crash
2012-05-01 16:08:04 -07:00
Chris Craik
272a51d1be am ad759f95: Merge "fix monkey scrolling crash" into jb-dev
* commit 'ad759f958a8bd87982b3f34d8424d1ac69c20342':
  fix monkey scrolling crash
2012-05-01 16:05:01 -07:00
Chris Craik
ad759f958a Merge "fix monkey scrolling crash" into jb-dev 2012-05-01 16:01:58 -07:00
Stephen Hines
d9abea8314 am 6c9cd4eb: am d28030ae: Merge "Start passing element/dim information along with FieldPacker." into jb-dev
* commit '6c9cd4eb7be819bfde5d4da5b3f2e3b36dc97f1b':
  Start passing element/dim information along with FieldPacker.
2012-05-01 15:59:31 -07:00
Stephen Hines
98f33aa272 am 790accaf: am a7228c88: Merge "Unhide FONT." into jb-dev
* commit '790accafa8dc2eb65c8baabcb171564ae8eca75d':
  Unhide FONT.
2012-05-01 15:59:28 -07:00
Stephen Hines
55920e896b am 2f99df45: am 10e3e9a4: Merge "Move mesh to end of test list until we fix LLVM." into jb-dev
* commit '2f99df45007bb87021e5a1fc69c3c9ba82e20859':
  Move mesh to end of test list until we fix LLVM.
2012-05-01 15:59:26 -07:00
Stephen Hines
6c9cd4eb7b am d28030ae: Merge "Start passing element/dim information along with FieldPacker." into jb-dev
* commit 'd28030ae51322b4419e4c7ee2501bd8a5a20434f':
  Start passing element/dim information along with FieldPacker.
2012-05-01 15:56:38 -07:00
Stephen Hines
790accafa8 am a7228c88: Merge "Unhide FONT." into jb-dev
* commit 'a7228c882c468aabaed41e4499805aa5474f0dec':
  Unhide FONT.
2012-05-01 15:56:37 -07:00
Stephen Hines
2f99df4500 am 10e3e9a4: Merge "Move mesh to end of test list until we fix LLVM." into jb-dev
* commit '10e3e9a41a2f2a401f2a7c17d5b87582b4d1b7fe':
  Move mesh to end of test list until we fix LLVM.
2012-05-01 15:56:35 -07:00
Stephen Hines
d28030ae51 Merge "Start passing element/dim information along with FieldPacker." into jb-dev 2012-05-01 15:54:37 -07:00
Stephen Hines
a7228c882c Merge "Unhide FONT." into jb-dev 2012-05-01 15:54:16 -07:00
Stephen Hines
10e3e9a41a Merge "Move mesh to end of test list until we fix LLVM." into jb-dev 2012-05-01 15:54:10 -07:00
Guang Zhu
071ffc895f am 80fbdcbd: am 7fdde0ce: Merge "remove extra semi colon" into jb-dev
* commit '80fbdcbdea6f6e0740da1f73490555400c5dc003':
  remove extra semi colon
2012-05-01 15:53:34 -07:00
Chris Craik
5f3c08a411 fix monkey scrolling crash
bug:6336994

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

Change-Id: Ib019ca68f6e57f98e30b022949c624bab4695294
2012-05-01 15:53:06 -07:00
Guang Zhu
80fbdcbdea am 7fdde0ce: Merge "remove extra semi colon" into jb-dev
* commit '7fdde0cee2ac90da6603585f4789644fbf00925d':
  remove extra semi colon
2012-05-01 15:49:48 -07:00
Jean-Baptiste Queru
e2b88bb8cc am 8e2f7ade: am 78821e8e: (-s ours) am 1b34c1bc: Merge "stagefright: Remove useless declarations"
* commit '8e2f7ade243b31e7948a9dbf22491c38a1405fd1':
  stagefright: Remove useless declarations
2012-05-01 15:48:35 -07:00
Guang Zhu
7fdde0cee2 Merge "remove extra semi colon" into jb-dev 2012-05-01 15:47:28 -07:00
Jean-Baptiste Queru
8e2f7ade24 am 78821e8e: (-s ours) am 1b34c1bc: Merge "stagefright: Remove useless declarations"
* commit '78821e8e22930214c4cd79192f988ca2266fa8cc':
  stagefright: Remove useless declarations
2012-05-01 15:44:37 -07:00
Adam Cohen
6684e09ced am 16f36e82: am c9ca7f38: Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev
* commit '16f36e8215ac6929cb330b25b30f7f3d442bdc27':
  Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
2012-05-01 15:41:07 -07:00
Adam Cohen
16f36e8215 am c9ca7f38: Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev
* commit 'c9ca7f38bccfa56bbca44998758869ec8c71f4d3':
  Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
2012-05-01 15:38:35 -07:00