10100 Commits

Author SHA1 Message Date
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
Wu-cheng Li
c58b42327d Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
bug:2544367
Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
2010-04-10 09:33:15 +08:00
Dianne Hackborn
f5c5d22c47 Fix issue #2581524: Car home icon should always go to car home
Rework how switching between modes work so the caller can tell us
whether they want to go to home.  (So car home launcher can now
tell us they always want to go home.)

Change-Id: Id4a8129027d6d162b4bae6f983911f1f4bf2578f
2010-04-09 16:49:08 -07:00
Romain Guy
4525c98114 Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646" into froyo 2010-04-09 16:08:17 -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
Wei Huang
c621b65d2f Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo 2010-04-09 15:34:46 -07:00
Wei Huang
927a3c96d1 bug #2542580: add the appropriate mdpi asset for chat icon.
Change-Id: I474eb5b8fe83bbc7f92005de651444447c8624e7
2010-04-09 15:27:10 -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
Dan Egnor
2d3df559de Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo 2010-04-09 12:50:11 -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
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
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
4e8d8238e1 Fix sim build (sim doesn't have strl*() reliably...)
Just stub out the TrafficStats code for the sim.
Bug: 2578938

Change-Id: Ie555f67f581d05ee446ea29cb2223feb350c52f9
2010-04-08 23:47:06 -07: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
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
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
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
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
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
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
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
Jeff Brown
ec7c78fbf5 @hide ACCESS_CACHE_FILESYSTEM and MOVE_PACKAGE
Bug: b/2553489
Change-Id: I681b3f9a243777b931298cc93c9d34c8d7eae0f2
2010-04-08 13:45:06 -07:00
Brad Fitzpatrick
228629e920 Rename logtag for clarity.
BUG=2581935

Change-Id: I85f0b704435861acd5a406ce5ec084b60696580c
2010-04-08 13:25:46 -07:00