Dan Egnor
8a03cfa3cd
am ca39b95d: am aeeea3da: am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
2010-04-10 11:58:33 -07:00
Kristian Monsen
89c33f91a5
am 2843b0e3: am 53f772ed: am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
2010-04-10 11:58:26 -07:00
Grace Kloba
f8f769be52
am 6fd14242: am 449491ce: am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message
2010-04-10 11:58:19 -07:00
Dan Egnor
ca39b95d54
am aeeea3da: am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
2010-04-10 11:53:59 -07:00
Kristian Monsen
2843b0e3a6
am 53f772ed: am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
2010-04-10 11:53:52 -07:00
Grace Kloba
6fd142421d
am 449491ce: am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling.
2010-04-10 11:53:46 -07:00
Dan Egnor
aeeea3da3c
am 505f22d1: am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
...
Merge commit '505f22d1a4dbf1fceaf8deca443d7322386964e1' into kraken
* commit '505f22d1a4dbf1fceaf8deca443d7322386964e1':
Fix sim build (sim doesn't have strl*() reliably...)
2010-04-10 11:47:29 -07:00
Kristian Monsen
53f772eddb
am d25fb8db: am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
...
Merge commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31' into kraken
* commit 'd25fb8db8de213feb55cdfff087eabc6ee865f31':
Do not create intents for application/xhtml+xml
2010-04-10 11:47:23 -07:00
Grace Kloba
449491ced0
am 210462e5: am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
...
Merge commit '210462e57762be9bb016b4d05374cae5f48b5aea' into kraken
* commit '210462e57762be9bb016b4d05374cae5f48b5aea':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
2010-04-10 11:47:15 -07:00
Mathias Agopian
3dce8949db
am c0fa6589: am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken
2010-04-10 11:43:17 -07:00
Dan Egnor
505f22d1a4
am 2d3df559: Merge "Fix sim build (sim doesn\'t have strl*() reliably...)" into froyo
...
Merge commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12' into froyo-plus-aosp
* commit '2d3df559dea9ebb0ab263c2df26e8a345ed74d12':
Fix sim build (sim doesn't have strl*() reliably...)
2010-04-10 11:41:20 -07:00
Kristian Monsen
d25fb8db8d
am 34959e3f: Merge "Do not create intents for application/xhtml+xml" into froyo
...
Merge commit '34959e3fe87012d554af07fd6ad294b2ce3daea7' into froyo-plus-aosp
* commit '34959e3fe87012d554af07fd6ad294b2ce3daea7':
Do not create intents for application/xhtml+xml
2010-04-10 11:41:14 -07:00
Grace Kloba
210462e577
am e67e6b94: Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
...
Merge commit 'e67e6b94fd282283f1ffa2299fae536bee099715' into froyo-plus-aosp
* commit 'e67e6b94fd282283f1ffa2299fae536bee099715':
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
2010-04-10 11:41:09 -07:00
Mathias Agopian
c0fa658952
am cf2bd285: Merge "small cleanup. gEGLImpl should have been static" into kraken
2010-04-10 11:38:25 -07:00
Xavier Ducrohet
55f9c17777
Merge "README for layoutlib."
2010-04-09 18:34:16 -07:00
Xavier Ducrohet
3a8d3167bc
README for layoutlib.
...
Change-Id: If8192232b70f2c4084cf73abd54b7798296e8c16
2010-04-09 17:19:02 -07:00
Mathias Agopian
cf2bd28510
Merge "small cleanup. gEGLImpl should have been static" into kraken
2010-04-09 14:28:03 -07:00
Mathias Agopian
e547835c52
small cleanup. gEGLImpl should have been static
...
also added a ctor to initialized it in case we use it ont he stack
one day.
Change-Id: I2736b9bce3d8ba3b74fd029de4c18cca2cdbbf60
2010-04-09 14:26:07 -07:00
Romain Guy
365088f681
Merge "Don't supply a null child to the click listener. External bug # http://code.google.com/p/android/issues/detail?id=7644 "
2010-04-09 14:09:42 -07:00
Romain Guy
c9c82b5669
Don't supply a null child to the click listener.
...
External bug #http://code.google.com/p/android/issues/detail?id=7644
Change-Id: Iea2c0d7fa02d355fd68750d6dccf8e6c6773ab6b
2010-04-09 14:08:26 -07:00
Dan Egnor
2d3df559de
Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo
2010-04-09 12:50:11 -07:00
Kristian Monsen
34959e3fe8
Merge "Do not create intents for application/xhtml+xml" into froyo
2010-04-09 10:59:20 -07:00
Grace Kloba
e67e6b94fd
Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
2010-04-09 10:49:42 -07:00
Kristian Monsen
e9a2fe013d
Do not create intents for application/xhtml+xml
...
Fix for b 2584681, webview opens contents in browser.
Change-Id: I314e808a65f3c2043bd7bc7fcd44ac071f136bdc
2010-04-09 18:34:07 +01:00
Robert Greenwalt
f70c9f2db2
am 49267612: am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
2010-04-09 09:44:14 -07:00
Robert Greenwalt
4926761258
am 061cd6e3: am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
2010-04-09 09:39:59 -07:00
Robert Greenwalt
061cd6e322
am a68780dd: am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
...
Merge commit 'a68780dd0f0af0938b72fdf6539db575da471028' into kraken
* commit 'a68780dd0f0af0938b72fdf6539db575da471028':
Roaming data doesn't count against limits
2010-04-09 09:35:55 -07:00
Robert Greenwalt
a68780dd0f
am cb270410: Merge "Roaming data doesn\'t count against limits" into froyo
...
Merge commit 'cb27041034343a6a15f0812d04f66fefbed30686' into froyo-plus-aosp
* commit 'cb27041034343a6a15f0812d04f66fefbed30686':
Roaming data doesn't count against limits
2010-04-09 09:32:03 -07:00
Robert Greenwalt
cb27041034
Merge "Roaming data doesn't count against limits" into froyo
2010-04-09 09:29:21 -07:00
Eric Laurent
8e35fad15e
am 6bde88b9: am 2dc3da60: am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-04-09 09:06:51 -07:00
Eric Laurent
6bde88b9a9
am 2dc3da60: am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-04-09 09:03:30 -07:00
Eric Laurent
2dc3da60c4
am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
...
Merge commit '1921527c8dbcb9f10683e43bca12648cb2c6e5b7' into kraken
* commit '1921527c8dbcb9f10683e43bca12648cb2c6e5b7':
Additional fix for isssue 2548710: Native AudioTrack resources never freed.
2010-04-09 08:58:30 -07:00
Andreas Huber
2228135452
am 0e9a439b: am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
2010-04-09 08:53:26 -07:00
Patrick Scott
cf43910740
am c3f5a620: am 8999c46c: am 54c5330f: am da9a22bc: Save/restore the picture in a background thread.
2010-04-09 08:53:22 -07:00
Dan Egnor
4f1803215d
am 1554ecce: am 5b4cc93b: am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
2010-04-09 08:53:18 -07:00
Dan Egnor
172c1682c5
am f139940a: am d069fc9a: am a2bf7343: am 70c294b2: Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
2010-04-09 08:53:14 -07:00
Xavier Ducrohet
ca29b43b93
am 3aa8710c: am f31e4abd: am 3895007d: am bbc6e33b: Merge "Adds back the finalize method on the replaced Paint class." into froyo
2010-04-09 08:53:09 -07:00
Eric Laurent
1921527c8d
am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
...
Merge commit '9da7730d5f97270c356ee86298c5d6d45f39b264' into froyo-plus-aosp
* commit '9da7730d5f97270c356ee86298c5d6d45f39b264':
Additional fix for isssue 2548710: Native AudioTrack resources never freed.
2010-04-09 08:53:08 -07:00
Jeff Brown
aa7d09d456
am 52a28b25: am 6883c176: am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
2010-04-09 08:53:03 -07:00
Grace Kloba
9b6578071f
Set mHeldMotionless to a new MOTIONLESS_IGNORE state
...
for fling, this way we will trigger animateScroll
during fling for the faster performance. We also
avoid keep removing/sending DRAG_HELD_MOTIONLESS
message during fling.
Fix http://b/issue?id=2574172
2010-04-09 08:51:47 -07:00
Mathias Agopian
270d49a246
am 88235a5e: am 672ea584: Merge "fix [2420565] Surface.lockCanvas() updates the dirty region too often" into kraken
2010-04-09 08:51:46 -07:00
Irfan Sheriff
d2220bd4cd
am eaec9f2e: am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins
2010-04-09 08:51:19 -07:00
Eric Laurent
9da7730d5f
Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-04-09 08:48:32 -07:00
Andreas Huber
0e9a439b0d
am b39c3aa7: am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
2010-04-09 07:15:09 -07:00
Andreas Huber
b39c3aa753
am 91ce0826: am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
...
Merge commit '91ce08269600a5b46c84d9480212bf17e1107c2f' into kraken
* commit '91ce08269600a5b46c84d9480212bf17e1107c2f':
Support for ID3 V2.4 tags.
2010-04-09 07:09:49 -07:00
Andreas Huber
91ce082696
am 4be2461f: Merge "Support for ID3 V2.4 tags." into froyo
...
Merge commit '4be2461f06de3cf70a3126d2e4590d35210b8397' into froyo-plus-aosp
* commit '4be2461f06de3cf70a3126d2e4590d35210b8397':
Support for ID3 V2.4 tags.
2010-04-09 07:06:11 -07:00
Andreas Huber
4be2461f06
Merge "Support for ID3 V2.4 tags." into froyo
2010-04-09 07:01:58 -07:00
Patrick Scott
c3f5a6201f
am 8999c46c: am 54c5330f: am da9a22bc: Save/restore the picture in a background thread.
2010-04-09 06:47:56 -07:00
Patrick Scott
8999c46c77
am 54c5330f: am da9a22bc: Save/restore the picture in a background thread.
...
Merge commit '54c5330f23adc0f9928936f44b2d20d327d900c8' into kraken
* commit '54c5330f23adc0f9928936f44b2d20d327d900c8':
Save/restore the picture in a background thread.
2010-04-09 06:43:47 -07:00
Patrick Scott
54c5330f23
am da9a22bc: Save/restore the picture in a background thread.
...
Merge commit 'da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07' into froyo-plus-aosp
* commit 'da9a22bc5cfd87d80d5afa53fa8c1d29b0407a07':
Save/restore the picture in a background thread.
2010-04-09 06:37:11 -07:00