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
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
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
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
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
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
Dan Egnor
5b4cc93b0d
am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
...
Merge commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68' into kraken
* commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68':
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
2010-04-08 23:08:56 -07:00
Dan Egnor
f5d506d929
am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().
...
Merge commit '78158db51029e7dbe160e60af0deb7594bec051d' into froyo-plus-aosp
* commit '78158db51029e7dbe160e60af0deb7594bec051d':
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
2010-04-08 23:04:16 -07:00
Dan Egnor
78158db510
Hail-Mary attempt to avoid apparent blocking problems in readEvents().
...
Use the same procedure (select() with a short timeout) used by "logcat -d",
which doesn't seem to have any blocking problems.
Bug: 2569403
Change-Id: Ia27bb4207919a1288716b41a007b4b4b52f8e90a
2010-04-08 22:59:43 -07: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
Robert Greenwalt
673a2f6273
am b2216375: am da0498c5: am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:30:55 -07:00
Robert Greenwalt
da0498c598
am 6cf3d4aa: am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75' into kraken
* commit '6cf3d4aa7612c3e6d6bc0c9622200c4fa1237f75':
Updating some notificiation UI for Throttling
2010-04-08 16:25:54 -07:00
Robert Greenwalt
6cf3d4aa76
am cc691f50: Merge "Updating some notificiation UI for Throttling" into froyo
...
Merge commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7' into froyo-plus-aosp
* commit 'cc691f5061f4f5e687bf847078ee2ba387bdacb7':
Updating some notificiation UI for Throttling
2010-04-08 16:18:31 -07:00
Robert Greenwalt
cc691f5061
Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:09:31 -07:00
Robert Greenwalt
c87dc6dc90
Updating some notificiation UI for Throttling
...
String update and make one an ongoing notification.
bug:2576057
Change-Id: I7980f110c7eed8e8bf305490eddaa58e2949e3be
2010-04-08 16:00:26 -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
Brad Fitzpatrick
9c3554e997
am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken
* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
Rename logtag for clarity.
2010-04-08 14:08:56 -07:00
Brad Fitzpatrick
a8fbedbf5e
Missed these ones in the previous rename.
...
BUG=2581935
Change-Id: I12e7fc924d7164ab4a5ff7bd6ee52a10f7551ad4
2010-04-08 14:08:54 -07:00
Grace Kloba
642d1556f1
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 can drop by 30%.
...
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp
* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
For performance reason, we choose to block the picture
2010-04-08 14:08:35 -07:00
Grace Kloba
3f73549bc8
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 can drop by 30%." into froyo
2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
4183b514bb
am c62cdef4: Merge "Rename logtag for clarity." into froyo
...
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp
* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
Rename logtag for clarity.
2010-04-08 14:04:43 -07:00
Brad Fitzpatrick
c62cdef4ec
Merge "Rename logtag for clarity." into froyo
2010-04-08 14:01:23 -07:00
Jeff Brown
4879b52ea0
am 281a687c: am a07fd3c5: am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:58:54 -07:00
Robert Greenwalt
ac6ec41b67
resolved conflicts for merge of 4e33e9c1 to master
...
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
2010-04-08 13:54:58 -07:00
Jeff Brown
a07fd3c5a6
am a30b596d: am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
...
Merge commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b' into kraken
* commit 'a30b596d6ac46d88fd92dd3e1806b5de9b62b10b':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:51:48 -07:00
Jeff Brown
a30b596d6a
am ec7c78fb: @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
...
Merge commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f' into froyo-plus-aosp
* commit 'ec7c78fbf526816cd361fd482bdf3792ecfd9a9f':
@hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
2010-04-08 13:49:55 -07:00