Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,178 Commits 3 Branches 0 Tags
fb04fa5ff424e68113d00c47cfad80e3761d01a5
Commit Graph

22308 Commits

Author SHA1 Message Date
satok
fb04fa5ff4 Merge "Reduce window resizing during IME transition" 2012-05-02 01:28:00 -07:00
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
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
Adam Powell
39f412d8de Merge "API modifications for TaskStackBuilder" into jb-dev 2012-05-01 19:10:32 -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
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
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
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
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
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
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
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
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
Jeff Sharkey
dd471e6a6f Catch CCE when migrating to ClipData. 
Bug: 6231948
Change-Id: I51bc272d29a17881b3d4908fda549da20aa7e6b3
 2012-05-01 13:08: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
Brett Chabot
15720f88dd Merge "Prevent binder flooding when sending instrumentation status." 2012-05-01 12:35:46 -07:00
Brett Chabot
d733ec3b28 Prevent binder flooding when sending instrumentation status. 
There is a long standing bug in the InstrumentationTestRunner where executing
many fast-running tests causes it to hang with 'FAILED BINDER TRANSACTION'
messages in the logs.

This commit changes the Instrumentation status updates to be sent synchronously.

Bug 1796494

Change-Id: Ifd1af31158353d727bd88283eaeb90933ba1a3ca
 2012-05-01 12:33:28 -07:00
Gilles Debunne
2fb40285c7 API fix in CheckedTextView 
Bug 6103310

Change-Id: Ic144ed99199a296df3ef1a16f59caff08af58fd9
 2012-05-01 12:11:23 -07:00
Gilles Debunne
30faddc209 am 43b32a1c: am 8ed491b7: Merge "API fix, AutoCompleteTextView" into jb-dev 
* commit '43b32a1cd495092e0cfe466b9f0df1bb9aa2a274':
  API fix, AutoCompleteTextView
 2012-05-01 12:04:46 -07:00
Gilles Debunne
aa8c6f99f1 am dceca730: am 1dcd2bfc: Merge "API fix in TextView" into jb-dev 
* commit 'dceca730d3092b38815b41f637eb6dbd419aac7d':
  API fix in TextView
 2012-05-01 12:04:43 -07:00
Gilles Debunne
43b32a1cd4 am 8ed491b7: Merge "API fix, AutoCompleteTextView" into jb-dev 
* commit '8ed491b75b08df3944481a9509dea2606a265857':
  API fix, AutoCompleteTextView
 2012-05-01 12:01:05 -07:00
Gilles Debunne
dceca730d3 am 1dcd2bfc: Merge "API fix in TextView" into jb-dev 
* commit '1dcd2bfcabf565aa860fabc69ef54c8d66128a45':
  API fix in TextView
 2012-05-01 12:01:03 -07:00
Gilles Debunne
8ed491b75b Merge "API fix, AutoCompleteTextView" into jb-dev 2012-05-01 11:58:35 -07:00
Gilles Debunne
1dcd2bfcab Merge "API fix in TextView" into jb-dev 2012-05-01 11:58:26 -07:00
Michael Jurka
44c4e29a45 am 38abb6bd: am c81a0751: Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 
* commit '38abb6bdab7703ba4763e1969d98ad8d20500451':
  Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
 2012-05-01 11:54:42 -07:00
Michael Jurka
38abb6bdab am c81a0751: Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 
* commit 'c81a075196a6e0feed452b689ef523e156701f95':
  Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"
 2012-05-01 11:50:22 -07:00
Michael Jurka
c81a075196 Merge "Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)"" into jb-dev 2012-05-01 11:47:36 -07:00
Winson Chung
0b3d3a3a56 Revert "Adding getters/setters for StackView xml attrs. (Bug 6104219)" 
This reverts commit 7ced8f9cab
 2012-05-01 11:46:09 -07:00
Dianne Hackborn
ed43b1877d am 6d01aea3: am a25c8a97: Merge "Add new APIs for permission group flags and priorities." into jb-dev 
* commit '6d01aea3ef7d7f28e08c0781fc9ce5c05e6b6044':
  Add new APIs for permission group flags and priorities.
 2012-05-01 11:21:55 -07:00
Dianne Hackborn
6d01aea3ef am a25c8a97: Merge "Add new APIs for permission group flags and priorities." into jb-dev 
* commit 'a25c8a97aff5f67a70857e6776bba8b4c517a286':
  Add new APIs for permission group flags and priorities.
 2012-05-01 11:18:16 -07:00
Dianne Hackborn
a25c8a97af Merge "Add new APIs for permission group flags and priorities." into jb-dev 2012-05-01 11:15:51 -07:00
Winson Chung
350b9ced4e am aa434805: am 7e400cfb: Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev 
* commit 'aa4348053857ae5b3ee00cb093057ed0e424f2ba':
  Adding getters/setters for StackView xml attrs. (Bug 6104219)
 2012-05-01 11:01:21 -07:00
Winson Chung
aa43480538 am 7e400cfb: Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev 
* commit '7e400cfb715858a168add7fa6eaa262ab8ad0695':
  Adding getters/setters for StackView xml attrs. (Bug 6104219)
 2012-05-01 10:58:56 -07:00
Winson Chung
7e400cfb71 Merge "Adding getters/setters for StackView xml attrs. (Bug 6104219)" into jb-dev 2012-05-01 10:55:14 -07:00
James Dong
9f766adbf7 am e4816864: am 59eaa907: Merge "Fix a race condition in Camera API for handling focus" into jb-dev 
* commit 'e481686464197f808d0e4f13821bb29831810645':
  Fix a race condition in Camera API for handling focus
 2012-05-01 10:31:22 -07:00
James Dong
e481686464 am 59eaa907: Merge "Fix a race condition in Camera API for handling focus" into jb-dev 
* commit '59eaa907fef9454f6f5ff2ab727eef43bdf7f88d':
  Fix a race condition in Camera API for handling focus
 2012-05-01 10:27:59 -07:00
Amith Yamasani
5685a5be6a am a6a7e53b: am 2d25d467: Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev 
* commit 'a6a7e53bf3aecb15792c1e8ee96c3057b1ac2b69':
  Fixes PreferenceScreen padding and scrollbar position.
 2012-05-01 10:27:50 -07:00