Ben Murdoch
82a83da301
am d36bde24: am 93e3bf12: Merge "Fix up the WebCoreThreadWatchdog" into jb-dev
...
* commit 'd36bde2494a8635bc633d4bbd02f82bbfb72b7db':
Fix up the WebCoreThreadWatchdog
2012-05-21 12:39:40 -07:00
Chris Wren
c92c84ec96
am 125a45ed: am 468a2ac6: Merge "Don\'t assume digest lines are GONE, we may be recycling them." into jb-dev
...
* commit '125a45ed82ca2c7622eb18c17a0a8bb077fb0928':
Don't assume digest lines are GONE, we may be recycling them.
2012-05-21 11:52:49 -07:00
George Mount
4527a8d641
Consider fixed layers when scrolling the edit box.
...
Bug 6147580
Webkit Change: I810891decf0bad682e90f29f0f65c6b765b7d6d6
Change-Id: Idaa538824e611acd64eb5a4ccb7866d3c978a077
2012-05-18 13:56:27 -07:00
Dianne Hackborn
ba910bc004
am cefbeb68: am 20c0cdbb: Merge "Have the stable layout take into account the window\'s fullscreen flag." into jb-dev
...
* commit 'cefbeb683416a2bbc20905f280eaeadb349cb9d9':
Have the stable layout take into account the window's fullscreen flag.
2012-05-17 20:56:51 -07:00
Svetoslav Ganov
e8d879bfee
am 765cbbe7: am a4c1b0a7: Merge "Fixing the build for real." into jb-dev
...
* commit '765cbbe74ff74c743f556e7ff67e6c7bef02363a':
Fixing the build for real.
2012-05-17 20:56:47 -07:00
Svetoslav Ganov
72e15ceb85
am cefd97c8: am e54c5f13: Merge "Exposing some accessiblity actions only for enabled views." into jb-dev
...
* commit 'cefd97c8546d6dca184e8ac9589ab2ff1b795c06':
Exposing some accessiblity actions only for enabled views.
2012-05-17 20:56:37 -07:00
Svetoslav Ganov
f1a97a851d
am 044d40ad: am 824aa860: Merge "Accessibility service needs to request permission to be bound to." into jb-dev
...
* commit '044d40ad87f5f6a321aa48f74e05b8355c40f422':
Accessibility service needs to request permission to be bound to.
2012-05-17 17:18:21 -07:00
Adam Powell
3cd72d442b
am f53952a9: am 648337b3: Merge "Fix a bug where late-invalidating views with animations would be held for too long by ViewRootImpl" into jb-dev
...
* commit 'f53952a9a7aa5ed8af4867b9efcc765c7910b038':
Fix a bug where late-invalidating views with animations would be held for too long by ViewRootImpl
2012-05-17 17:18:15 -07:00
Carlos Valdivia
43e323a437
am 9a824f07: am 86401950: Merge "Streamline the logic to add account." into jb-dev
...
* commit '9a824f07a3e8ec49948cf6e0f300e1d86f16fea6':
Streamline the logic to add account.
2012-05-17 17:18:11 -07:00
Adam Powell
db03e5fee8
am 8afcf705: am 7fde8e2b: Merge "Be more tolerant in TaskStackBuilder" into jb-dev
...
* commit '8afcf70531298de6f79874e0655431322e441606':
Be more tolerant in TaskStackBuilder
2012-05-17 17:18:08 -07:00
Jeff Brown
148e0b7a1d
am 7ce7fe3b: am 33ebe8c8: Merge "Add systrace method tags for measure and layout." into jb-dev
...
* commit '7ce7fe3b6170c5765a8045a78a272e13f1064d6a':
Add systrace method tags for measure and layout.
2012-05-17 17:18:05 -07:00
Jeff Brown
4c98c36358
am 4fcef3c6: am 6dc23b8e: Merge "Add a label for the new video trace tag." into jb-dev
...
* commit '4fcef3c694852897f61592d72be6c5d27de5cfed':
Add a label for the new video trace tag.
2012-05-17 17:18:02 -07:00
John Reck
7ac5151254
am cd471e95: am b27a4f9b: Merge "Remove custom scrollbar logic" into jb-dev
...
* commit 'cd471e95c8236b23ad0f0e1ad256e2bd60416cac':
Remove custom scrollbar logic
2012-05-17 17:17:57 -07:00
Jeff Brown
9b48e8063d
am 046c8619: am 0d28cdf1: Merge "Fix a possible starvation issue related to vsync." into jb-dev
...
* commit '046c86191653ef3ba49c1397cb2242562a410ae4':
Fix a possible starvation issue related to vsync.
2012-05-17 15:33:50 -07:00
Mathias Agopian
4df1245322
am 44d3513c: am 128c89cd: Merge "fix SensorManager.getAngleChange() documentation" into jb-dev
...
* commit '44d3513ccf4ff88695de599861aedcad3884f273':
fix SensorManager.getAngleChange() documentation
2012-05-17 15:33:46 -07:00
Svetoslav Ganov
c3c1304d39
am dcf56b2d: am 6467f94b: Merge "Make AbsSeekBar widget adjustable via accessibility actions." into jb-dev
...
* commit 'dcf56b2dea002bff59af6abb4ce77a39dd06d753':
Make AbsSeekBar widget adjustable via accessibility actions.
2012-05-17 15:33:37 -07:00
John Reck
ef64b0eb1c
am 3d672d3f: am c43db491: Merge "Fix android:focusableInTouchMode support" into jb-dev
...
* commit '3d672d3fc98bff770289b1fb50ef11ba135d9552':
Fix android:focusableInTouchMode support
2012-05-17 15:33:25 -07:00
Adam Cohen
693cf16f85
am 6340b3f0: am e0bb6fe3: Merge "Cap widget bitmap usage by screen size (issue 6464700)" into jb-dev
...
* commit '6340b3f028edec783ac51970421f7816195408fd':
Cap widget bitmap usage by screen size (issue 6464700)
2012-05-17 15:32:50 -07:00
Svetoslav Ganov
88b2b90e7d
am c2f64117: am c5fb5805: Merge "Accessiblity focus not following input focus and text nav broken." into jb-dev
...
* commit 'c2f6411741949924d42e2c4aaefc33e6312cdd68':
Accessiblity focus not following input focus and text nav broken.
2012-05-17 15:32:42 -07:00
Ben Murdoch
d36bde2494
am 93e3bf12: Merge "Fix up the WebCoreThreadWatchdog" into jb-dev
...
* commit '93e3bf1260557f2b167c7f7b1e671deb69edec3f':
Fix up the WebCoreThreadWatchdog
2012-05-17 09:03:02 -07:00
Ben Murdoch
93e3bf1260
Merge "Fix up the WebCoreThreadWatchdog" into jb-dev
2012-05-17 09:00:26 -07:00
Chris Wren
125a45ed82
am 468a2ac6: Merge "Don\'t assume digest lines are GONE, we may be recycling them." into jb-dev
...
* commit '468a2ac63a065680da30f5e796583d53f70f8e25':
Don't assume digest lines are GONE, we may be recycling them.
2012-05-17 07:02:30 -07:00
Chris Wren
4ed80d581c
Don't assume digest lines are GONE, we may be recycling them.
...
Bug: 6500945
Change-Id: I0f01ccdde25bebb8335f0d34408877b895d286ff
2012-05-17 09:35:34 -04:00
Ben Murdoch
74d37b9653
Fix up the WebCoreThreadWatchdog
...
Make the WebCoreWatchdog aware of the WebViews it is monitoring
(rather than the Activity context which may become stale) and
ensure that the code for the prompt dialog is run on the UI
thread.
Bug: 6420310
Change-Id: Ied003938edb04858c85bcc2491c4b2c4c0ede6eb
2012-05-17 12:38:07 +01:00
Dianne Hackborn
cefbeb6834
am 20c0cdbb: Merge "Have the stable layout take into account the window\'s fullscreen flag." into jb-dev
...
* commit '20c0cdbbf79cef18e59514e0f53dfbcac0bef600':
Have the stable layout take into account the window's fullscreen flag.
2012-05-16 19:43:37 -07:00
Dianne Hackborn
20c0cdbbf7
Merge "Have the stable layout take into account the window's fullscreen flag." into jb-dev
2012-05-16 19:41:09 -07:00
Svetoslav Ganov
765cbbe74f
am a4c1b0a7: Merge "Fixing the build for real." into jb-dev
...
* commit 'a4c1b0a7ca48c0b9fcc0a4af393faf64d0a16b91':
Fixing the build for real.
2012-05-16 19:30:01 -07:00
Svetoslav Ganov
a4c1b0a7ca
Merge "Fixing the build for real." into jb-dev
2012-05-16 19:25:59 -07:00
Svetoslav Ganov
1e7456ba74
Fixing the build for real.
...
Change-Id: I792d029c7fff4d96fbe238ff4b3f268cb8603b95
2012-05-16 19:15:34 -07:00
Svetoslav Ganov
cefd97c854
am e54c5f13: Merge "Exposing some accessiblity actions only for enabled views." into jb-dev
...
* commit 'e54c5f13652166c5896ccfa55f047301a6c8b876':
Exposing some accessiblity actions only for enabled views.
2012-05-16 18:45:31 -07:00
Svetoslav Ganov
e54c5f1365
Merge "Exposing some accessiblity actions only for enabled views." into jb-dev
2012-05-16 18:43:31 -07:00
Svetoslav Ganov
044d40ad87
am 824aa860: Merge "Accessibility service needs to request permission to be bound to." into jb-dev
...
* commit '824aa860cd0b38b09779aab417612b115fd495a3':
Accessibility service needs to request permission to be bound to.
2012-05-16 17:58:00 -07:00
Svetoslav Ganov
824aa860cd
Merge "Accessibility service needs to request permission to be bound to." into jb-dev
2012-05-16 17:52:59 -07:00
Svetoslav Ganov
fb1e80a247
Exposing some accessiblity actions only for enabled views.
...
1. Some accessibility actions should not be performed on disabled
views. For example, scrolling should not be permitted while
accessibility focus should be. Made a quick pass over the
actions we expose now.
Change-Id: I36626dfbc0d2f480309a910f58f1de64e9e05675
2012-05-16 17:51:52 -07:00
Adam Powell
f53952a9a7
am 648337b3: Merge "Fix a bug where late-invalidating views with animations would be held for too long by ViewRootImpl" into jb-dev
...
* commit '648337b3a8024b22a77977024cdf171f83999d56':
Fix a bug where late-invalidating views with animations would be held for too long by ViewRootImpl
2012-05-16 17:50:47 -07:00
Carlos Valdivia
9a824f07a3
am 86401950: Merge "Streamline the logic to add account." into jb-dev
...
* commit '864019503c20350393fa1fbaecc36f0577ca45bb':
Streamline the logic to add account.
2012-05-16 17:47:21 -07:00
Adam Powell
8afcf70531
am 7fde8e2b: Merge "Be more tolerant in TaskStackBuilder" into jb-dev
...
* commit '7fde8e2ba27942ed61a1d57f63f3b4eea3e0bbc8':
Be more tolerant in TaskStackBuilder
2012-05-16 17:47:18 -07:00
Adam Powell
648337b3a8
Merge "Fix a bug where late-invalidating views with animations would be held for too long by ViewRootImpl" into jb-dev
2012-05-16 17:46:10 -07:00
Carlos Valdivia
864019503c
Merge "Streamline the logic to add account." into jb-dev
2012-05-16 17:44:34 -07:00
Adam Powell
7fde8e2ba2
Merge "Be more tolerant in TaskStackBuilder" into jb-dev
2012-05-16 17:44:25 -07:00
Jeff Brown
7ce7fe3b61
am 33ebe8c8: Merge "Add systrace method tags for measure and layout." into jb-dev
...
* commit '33ebe8c8c2179af371514b9c7a7d88faf531b18b':
Add systrace method tags for measure and layout.
2012-05-16 17:43:37 -07:00
Jeff Brown
4fcef3c694
am 6dc23b8e: Merge "Add a label for the new video trace tag." into jb-dev
...
* commit '6dc23b8e70e421cff46aa60c91ad1ba9d0bc4064':
Add a label for the new video trace tag.
2012-05-16 17:43:34 -07:00
Carlos Valdivia
cf0a881f1c
Streamline the logic to add account.
...
This cl ensures that we immediately route the user to the add account
activity if they don't have an account and their is only one relevant
account type. Also reordered the setContent logic to reduce flicker.
Note that as of this CL there is still some flicker remaining when
launching G+ without an account. But it appears to be fixed in other
apps.
Bug: 6455975
Change-Id: I91e33b4fb9618a31765b4a8651334b1c52640828
2012-05-16 17:43:17 -07:00
Jeff Brown
33ebe8c8c2
Merge "Add systrace method tags for measure and layout." into jb-dev
2012-05-16 17:40:03 -07:00
Jeff Brown
6dc23b8e70
Merge "Add a label for the new video trace tag." into jb-dev
2012-05-16 17:39:29 -07:00
John Reck
cd471e95c8
am b27a4f9b: Merge "Remove custom scrollbar logic" into jb-dev
...
* commit 'b27a4f9b0e29d4fd4722c9152a39269aba527ef6':
Remove custom scrollbar logic
2012-05-16 17:37:22 -07:00
John Reck
b27a4f9b0e
Merge "Remove custom scrollbar logic" into jb-dev
2012-05-16 17:35:08 -07:00
Adam Powell
3e3c4ee047
Fix a bug where late-invalidating views with animations would be held
...
for too long by ViewRootImpl
Change-Id: I1e32bf2683b50f8834f215a753f881b5d4b8dbc9
2012-05-16 17:34:21 -07:00
Jeff Brown
c8d2668bc4
Add systrace method tags for measure and layout.
...
Change-Id: I739f6384b390d1b34b09b622ca0f752de1dd7304
2012-05-16 17:27:24 -07:00
Jeff Brown
f558780c20
Add a label for the new video trace tag.
...
Change-Id: Ie296b4b5ca73987cdea7766f8698fc43704b2e81
2012-05-16 17:27:24 -07:00