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
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
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
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
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
Gilles Debunne
2fb40285c7
API fix in CheckedTextView
...
Bug 6103310
Change-Id: Ic144ed99199a296df3ef1a16f59caff08af58fd9
2012-05-01 12:11:23 -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
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
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
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
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
a6a7e53bf3
am 2d25d467: Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev
...
* commit '2d25d467e651048da0dece22c94c0e7e28d0e529':
Fixes PreferenceScreen padding and scrollbar position.
2012-05-01 10:25:22 -07:00
James Dong
59eaa907fe
Merge "Fix a race condition in Camera API for handling focus" into jb-dev
2012-05-01 10:24:46 -07:00
Amith Yamasani
2d25d467e6
Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev
2012-05-01 10:22:01 -07:00
George Mount
e563b19a82
am 91901aeb: Merge "Fix flicker while selecting text." into jb-dev
...
* commit '91901aeb66cf140f50a55e5a8a191585f336432b':
Fix flicker while selecting text.
2012-05-01 10:13:20 -07:00
George Mount
91901aeb66
Merge "Fix flicker while selecting text." into jb-dev
2012-05-01 10:10:16 -07:00
George Mount
8072976d7a
Fix flicker while selecting text.
...
Bug 6413113
Change-Id: I5c8d2cda1eae9d5670c757711c49ccc9e47b4127
2012-05-01 08:56:24 -07:00
Jean-Baptiste Queru
16e24dd88e
am ede38b5c: am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter."
...
* commit 'ede38b5c6c93bfd64522357d2075398c79431e1b':
Fixed group and child view caching in SimpleExpandableListAdapter.
2012-05-01 08:53:10 -07:00
Jean-Baptiste Queru
c6eda48e0a
am e28ccbab: am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."
...
* commit 'e28ccbab9a5634b6d9557240161310451c660e47':
Fixes an issue that occured unexpected exception "pointerIndex out of range".
2012-05-01 08:53:05 -07:00
Jean-Baptiste Queru
ede38b5c6c
am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter."
...
* commit '6a8186fb88455fcc418def0650b7b9f8f3573153':
Fixed group and child view caching in SimpleExpandableListAdapter.
2012-05-01 08:50:24 -07:00
Jean-Baptiste Queru
e28ccbab9a
am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."
...
* commit '7a0829850ee8d1ee2f436c40c8a5af2ff7d96533':
Fixes an issue that occured unexpected exception "pointerIndex out of range".
2012-05-01 08:50:18 -07:00
Jean-Baptiste Queru
f6d8e0cafd
am 50bd9d61: am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery."
...
* commit '50bd9d616695b2162b84a204bc678b83a14f59c9':
Avoiding horizontal keypad navigation trapping within gallery.
2012-05-01 06:47:24 -07:00
Jean-Baptiste Queru
2d28f53514
am 31ab51a3: am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items."
...
* commit '31ab51a369ab57c82d0271115ba31b3b20ce6e6b':
Prevent empty overflow popup when there are no overflow items.
2012-05-01 06:47:21 -07:00
Jean-Baptiste Queru
5e4f01f02d
am f59d2912: am bfe71c35: Merge "statistics from some cpus don\'t fit"
...
* commit 'f59d2912354a6be6f6181ec945f6f657a5469fb8':
statistics from some cpus don't fit
2012-05-01 06:47:15 -07:00
Jean-Baptiste Queru
50bd9d6166
am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery."
...
* commit '4426961e7b2eb7733dbb0661c47c6aea2f2f7e75':
Avoiding horizontal keypad navigation trapping within gallery.
2012-05-01 06:44:11 -07:00
Jean-Baptiste Queru
31ab51a369
am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items."
...
* commit '2066f7d9864d46858588a839a7f39a1526c737bc':
Prevent empty overflow popup when there are no overflow items.
2012-05-01 06:44:08 -07:00
Jean-Baptiste Queru
f59d291235
am bfe71c35: Merge "statistics from some cpus don\'t fit"
...
* commit 'bfe71c35a836e14b7a9f58d90f26fd187df82b06':
statistics from some cpus don't fit
2012-05-01 06:44:01 -07:00
Jean-Baptiste Queru
6a8186fb88
Merge "Fixed group and child view caching in SimpleExpandableListAdapter."
2012-05-01 06:43:03 -07:00
Jean-Baptiste Queru
7a0829850e
Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."
2012-05-01 06:42:12 -07:00
Jean-Baptiste Queru
4426961e7b
Merge "Avoiding horizontal keypad navigation trapping within gallery."
2012-05-01 05:52:22 -07:00
Jean-Baptiste Queru
2066f7d986
Merge "Prevent empty overflow popup when there are no overflow items."
2012-05-01 05:52:12 -07:00