75965 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Jean-Baptiste Queru
78821e8e22 am 1b34c1bc: Merge "stagefright: Remove useless declarations"
* commit '1b34c1bc240e6c2e085eee2b03c728b56b049e23':
  stagefright: Remove useless declarations
2012-05-01 15:37:18 -07:00
Adam Cohen
c9ca7f38bc Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev 2012-05-01 15:36:21 -07:00
Philip Milne
8a36e05443 Fix for layout parameter validation bug in GridLayout.
Bug 6404882.

When a cell has an unspecified row and a column that is specified as greater
than the specified number of columns, GridLayout fails to report or correct
the error and loops indefinitely searching for a valid row to place the cell.

There is a cyclic dependency between the validation of layout parameters
(and allocation of undefined cell indexes) and the maximum column/row counts.
A performance optimization in layout paramter allocation caused this dependency
to be handled in correctly. The problem is fixed in this CL for this bug and
the symmetric problem for rows.

Change-Id: I0392343bc8a721a0ca7163f58f233ba8046c22e2
2012-05-01 15:24:50 -07:00
Jean-Baptiste Queru
1b34c1bc24 Merge "stagefright: Remove useless declarations" 2012-05-01 14:48:06 -07:00
Amith Yamasani
159e62427e am d72ad2ac: Merge "Fix a bug in appwidget migration to multiuser directory." into jb-dev
* commit 'd72ad2ac88ae8477a95e18a800062446a58c524d':
  Fix a bug in appwidget migration to multiuser directory.
2012-05-01 14:01:10 -07:00
Amith Yamasani
d72ad2ac88 Merge "Fix a bug in appwidget migration to multiuser directory." into jb-dev 2012-05-01 13:57:53 -07:00
Amith Yamasani
e0eb39b548 Fix a bug in appwidget migration to multiuser directory.
Bug: 6393606

Migrate the old appwidgets.xml if the file doesn't exist,
not if the directory doesn't exist. It worked earlier because
this was the first service that I migrated to multi-user :(

Change-Id: I59bcbc31ff9d101e44dff5e5f44b3cab8f08dc06
2012-05-01 13:48:48 -07:00
Eric Fischer
de22c77ad8 am dd8412d4: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'dd8412d4fb57fbf53b25460cda8458cdf9dfac07':
  Import translations. DO NOT MERGE
2012-05-01 13:44:59 -07:00
Eric Fischer
dd8412d4fb Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-01 13:42:13 -07:00
James Dong
ea1d7f43ac am cb6662ac: Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev
* commit 'cb6662ac532beeba0d3adb85fa37d307838b4325':
  Add video scaling mode support with a new public method in MediaPlayer.java class
2012-05-01 13:38:45 -07:00
Andreas Huber
9d16f3f9c6 am f72d392f: Merge "Make java constants consistent with native counterparts." into jb-dev
* commit 'f72d392f5deeda68af6a8a9b4a8c62f215331129':
  Make java constants consistent with native counterparts.
2012-05-01 13:35:58 -07:00
James Dong
cb6662ac53 Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev 2012-05-01 13:34:28 -07:00
Andreas Huber
f72d392f5d Merge "Make java constants consistent with native counterparts." into jb-dev 2012-05-01 13:32:18 -07:00
Chris Craik
d95c556e5d am 37a8370b: Merge "Revert "Add header for forward compatibility"" into jb-dev
* commit '37a8370b6279c5359f6d32b5abb3c3fd37e826b3':
  Revert "Add header for forward compatibility"
2012-05-01 13:24:41 -07:00
Chris Craik
37a8370b62 Merge "Revert "Add header for forward compatibility"" into jb-dev 2012-05-01 13:22:08 -07:00
Jeff Sharkey
dd471e6a6f Catch CCE when migrating to ClipData.
Bug: 6231948
Change-Id: I51bc272d29a17881b3d4908fda549da20aa7e6b3
2012-05-01 13:08:27 -07:00
Daniel Sandler
eee84b48bc am 73b61d67: Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev
* commit '73b61d67109c9a4267b93c238bb9cbab7b1304c4':
  Move legacy menu key to bottom right on sw600dp.
2012-05-01 13:02:27 -07:00
Adam Cohen
ffc46a5c7c Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
Change-Id: If60f98c5e1be66ca840cbd4953841ef2c57a012b
2012-05-01 12:58:12 -07:00
Daniel Sandler
73b61d6710 Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev 2012-05-01 12:58:09 -07:00
Brian Colonna
6de7210c30 am f4197bf9: Merge "Fix 6395288: Added lock to avoid unbind race condition" into jb-dev
* commit 'f4197bf93532b333dbea13792c422b65b0ceebf3':
  Fix 6395288: Added lock to avoid unbind race condition
2012-05-01 12:56:55 -07:00
Brian Colonna
f4197bf935 Merge "Fix 6395288: Added lock to avoid unbind race condition" into jb-dev 2012-05-01 12:54:02 -07:00
Steven Ross
1b4538c77d am d9a00323: Merge "Don\'t show Face Unlock on initial boot fixes 6396685" into jb-dev
* commit 'd9a00323126cb4abae9e93089cf0a27ec8c7122d':
  Don't show Face Unlock on initial boot fixes 6396685
2012-05-01 12:54:01 -07:00
Steven Ross
d9a0032312 Merge "Don't show Face Unlock on initial boot fixes 6396685" into jb-dev 2012-05-01 12:49:28 -07:00
Andreas Huber
48dc91b514 Make java constants consistent with native counterparts.
Change-Id: I481dfc18c170b4c60682ef1b38b57e10fb73d004
2012-05-01 12:27:26 -07:00
James Dong
454014e55f Add video scaling mode support with a new public method in MediaPlayer.java class
o related-to-bug: 5454345

Change-Id: I379b679eb6dd87f47f87a58791a5d0c7251b3a74
2012-05-01 12:22:35 -07:00
Eric Fischer
48c220df10 Import translations. DO NOT MERGE
Change-Id: I50b9a3a66234f1570955532c6383570cade19232
2012-05-01 12:19:31 -07:00