Romain Guy
3e089c6c65
am aa03df8a: am 50e0d9ae: am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646 " into froyo
2010-04-10 11:59:16 -07:00
Jesse Wilson
690de26230
am 97a22e1b: am 86b0276a: am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
2010-04-10 11:58:52 -07:00
Robert Greenwalt
8817ad92dd
am b049ab29: am 82052192: am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
2010-04-10 11:58:40 -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
Romain Guy
50e0d9ae31
am 376722fc: am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646 " into froyo
...
Merge commit '376722fcdf41ade7286bcdb757564559d35a4976' into kraken
* commit '376722fcdf41ade7286bcdb757564559d35a4976':
Fix regression introduced when fixing focus issue with ScrollView.
2010-04-10 11:48:02 -07:00
Jesse Wilson
86b0276a39
am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
...
Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken
* commit 'f9e90378d50210298d1cec2b913653597cd62be4':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
2010-04-10 11:47:45 -07:00
Robert Greenwalt
82052192c5
am 090af2c5: am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
...
Merge commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b' into kraken
* commit '090af2c57024b1ac0ba2ce0ecbc8e4e814c98c8b':
Make ThrottleService notice policy changes.
2010-04-10 11:47:35 -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
Romain Guy
376722fcdf
am 4525c981: Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646 " into froyo
...
Merge commit '4525c98114c1e570ecef84521f66095e866af77d' into froyo-plus-aosp
* commit '4525c98114c1e570ecef84521f66095e866af77d':
Fix regression introduced when fixing focus issue with ScrollView.
2010-04-10 11:41:54 -07:00
Jesse Wilson
f9e90378d5
am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
...
Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp
* commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
2010-04-10 11:41:38 -07:00
Robert Greenwalt
090af2c570
am 4dceedc1: Merge "Make ThrottleService notice policy changes." into froyo
...
Merge commit '4dceedc133ef0487577badb67100d20473d87762' into froyo-plus-aosp
* commit '4dceedc133ef0487577badb67100d20473d87762':
Make ThrottleService notice policy changes.
2010-04-10 11:41:25 -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
Romain Guy
2d4cff64b4
Fix regression introduced when fixing focus issue with ScrollView.
...
Bug #2581646
The correct fix is to make ScrollView ignore the BACK key instead of consuming it.
Change-Id: I5c029a5c60ae8e7791391f63672c44b5c96fec71
2010-04-09 15:39:00 -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
Jesse Wilson
bc284a5f9f
Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
2010-04-09 14:01:07 -07:00
Jesse Wilson
7cfa90fee5
Move the public method HttpDateTime.parse() into AndroidHttpClient.
...
See bug http://b/2553589
Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
2010-04-09 13:34:15 -07:00
Robert Greenwalt
4dceedc133
Merge "Make ThrottleService notice policy changes." into froyo
2010-04-09 13:00:05 -07:00
Robert Greenwalt
81aa0971d7
Make ThrottleService notice policy changes.
...
Added ContentObserver to watch relevant Secure Settings.
Also added new policy-change broadcast to let settings know.
Lastly reorged things a bit so that all of our broadcasts are sent at boot so the sticky ones
are populated.
bug:2576057
Change-Id: Ie11ffb057de9c801a5088612cd464ea062f3a666
2010-04-09 12:42:45 -07:00
Kristian Monsen
34959e3fe8
Merge "Do not create intents for application/xhtml+xml" into froyo
2010-04-09 10:59:20 -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
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
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
Irfan Sheriff
d2220bd4cd
am eaec9f2e: am d99540d7: am 750f3211: am c9b6851a: Throttling framework addins
2010-04-09 08:51:19 -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
Patrick Scott
da9a22bc5c
Save/restore the picture in a background thread.
...
Bug: 2573879
Change-Id: I0962f5286d3a68f8a9093f0c22917b0542ea9291
2010-04-09 08:10:38 -04:00
Daisuke Miyakawa
4ac671ad97
Add comments for vCard parser.
...
Bug: 2576594
Change-Id: I3303a350bdea7b1b84bd1fb318d31ba5a229457d
2010-04-09 14:53:24 +09:00
Jeff Brown
6883c1769f
am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
...
Merge commit '6c099149daff56ca04ab40a86950e7b61caf6505' into kraken
* commit '6c099149daff56ca04ab40a86950e7b61caf6505':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
2010-04-08 22:50:42 -07:00
Jeff Brown
6c099149da
am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
...
Merge commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp
* commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
2010-04-08 22:39:19 -07:00
Jeff Brown
37d2f5d15b
Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
2010-04-08 17:18:15 -07:00
Irfan Sheriff
d99540d7a2
am 750f3211: am c9b6851a: Throttling framework addins
...
Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken
* commit '750f32117b96a8af4fb03fae459a80f79a667fca':
Throttling framework addins
2010-04-08 17:05:06 -07:00
Irfan Sheriff
750f32117b
am c9b6851a: Throttling framework addins
...
Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp
* commit 'c9b6851af68bdc20c4903b16c344e9f116647219':
Throttling framework addins
2010-04-08 17:01:59 -07:00
Irfan Sheriff
c9b6851af6
Throttling framework addins
...
Add ThrottleManager in getSystemService
Add API for URL fetch
Bug: 2576057
Change-Id: Icd25c8b91ea4beea15c74e8ad7292ab48c962253
2010-04-08 16:53:32 -07:00
Jeff Brown
64010e8350
Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
...
Change-Id: I4be691f20f650b412beb22b199a4cbef879b2668
2010-04-08 16:52:18 -07:00
Dan Egnor
a8369d875d
am 9a907e75: am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:59:49 -07:00
Dan Egnor
a40b3a8d98
am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
...
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken
* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
Change TrafficStats to a new JNI implementation.
2010-04-08 14:53:06 -07:00
Dan Egnor
c1420832a8
am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo
...
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp
* commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
Change TrafficStats to a new JNI implementation.
2010-04-08 14:48:50 -07:00
Dan Egnor
5945579e4e
Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:45:07 -07:00
Dan Egnor
7829f3d4b1
am c138fd3a: am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:28:29 -07:00
Dan Egnor
a28a05f31b
am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo
...
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken
* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
Missed these ones in the previous rename.
2010-04-08 14:19:52 -07:00
Grace Kloba
923c53b993
am f1055bd5: am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during
2010-04-08 14:19:38 -07:00
Dan Egnor
f1f00f5bdd
am 21248080: Merge "Missed these ones in the previous rename." into froyo
...
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp
* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
Missed these ones in the previous rename.
2010-04-08 14:15:29 -07:00
Brad Fitzpatrick
3f73e4869f
am 341d0a52: am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
2010-04-08 14:14:46 -07:00
Grace Kloba
edcac52a4e
am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate ca
...
Merge commit '642d1556f13ac13f07515309288214e532029c50' into kraken
* commit '642d1556f13ac13f07515309288214e532029c50':
For performance reason, we choose to block the picture
2010-04-08 14:12:58 -07:00
Dan Egnor
2124808060
Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:10:50 -07:00