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

22286 Commits

Author SHA1 Message Date
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
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
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
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
772bf5f6ef am e563b19a: am 91901aeb: Merge "Fix flicker while selecting text." into jb-dev 
* commit 'e563b19a82f7a6ef752a3953925f6358d04cc8db':
  Fix flicker while selecting text.
 2012-05-01 10:16:03 -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
Jean-Baptiste Queru
92ce8d6918 am 16e24dd8: am ede38b5c: am 6a8186fb: Merge "Fixed group and child view caching in SimpleExpandableListAdapter." 
* commit '16e24dd88e4c327ce81c9b7158d9203feb4902e4':
  Fixed group and child view caching in SimpleExpandableListAdapter.
 2012-05-01 08:56:25 -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
1520b5c8d4 am c6eda48e: am e28ccbab: am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"." 
* commit 'c6eda48e0ac261f3e8f949d65d785b85b6e6f542':
  Fixes an issue that occured unexpected exception "pointerIndex out of range".
 2012-05-01 08:56:20 -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
45682f65dc am f6d8e0ca: am 50bd9d61: am 4426961e: Merge "Avoiding horizontal keypad navigation trapping within gallery." 
* commit 'f6d8e0cafd4cd8501988b0a13379bbfa594f21f7':
  Avoiding horizontal keypad navigation trapping within gallery.
 2012-05-01 06:50:05 -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
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
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
Gilles Debunne
f03acef0ab API fix in TextView 
Bug 6104140

Change-Id: I44af54ac7c194335a649e5878ff47dc894fa46fe
 2012-04-30 21:08:41 -07:00
Winson Chung
7ced8f9cab Adding getters/setters for StackView xml attrs. (Bug 6104219) 
Change-Id: Iaa1ba0292b0d40f73e315028d9f01ef407021e57
 2012-04-30 18:50:52 -07:00