10127 Commits

Author SHA1 Message Date
Christopher Tate
c47f4be6c7 am 7fef3c57: am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da' into kraken

* commit '7fef3c57eb6f5fbef65dd553ea49d93111d595da':
  API CHANGE: remove obsolete constants and hide some methods
2010-04-12 15:19:16 -07:00
Christopher Tate
7fef3c57eb am b9e3e4ce: Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Merge commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a' into froyo-plus-aosp

* commit 'b9e3e4ce7e8e57a28ce15680d406c83cba1eb63a':
  API CHANGE: remove obsolete constants and hide some methods
2010-04-12 15:16:07 -07:00
Christopher Tate
fc922f1153 API CHANGE: remove obsolete constants and hide some methods
This change removes some unused constants from BackupDataOutput
and hides a few methods that do not actually need to be exposed.

Change-Id: I47a9a107a5b58f4d53b5a2fcf9b73a765b1c5dd8
2010-04-12 14:15:37 -07:00
Patrick Scott
86cc001c9f am c9eaa3cb: am 36acfbc2: Add a bulk request method for bookmark icons.
Merge commit 'c9eaa3cbb0d6152cd156a9e66ef23389042b48b5' into kraken

* commit 'c9eaa3cbb0d6152cd156a9e66ef23389042b48b5':
  Add a bulk request method for bookmark icons.
2010-04-12 11:55:53 -07:00
Patrick Scott
c9eaa3cbb0 am 36acfbc2: Add a bulk request method for bookmark icons.
Merge commit '36acfbc2b8df6e62f2d583933eca3a49265279a6' into froyo-plus-aosp

* commit '36acfbc2b8df6e62f2d583933eca3a49265279a6':
  Add a bulk request method for bookmark icons.
2010-04-12 11:53:09 -07:00
Patrick Scott
36acfbc2b8 Add a bulk request method for bookmark icons.
Rather than dispatch a message for every url in the db, send a message to the
WebCoreThread to handle the query and iteration.  Update the documentation for
requestAllIcons.

Bug: 2581894
Change-Id: I8af4f87570465dff3839db4ac492883e8805b007
2010-04-12 14:26:13 -04:00
Leon Scroggins
fac110dc24 am 853a4240: am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '853a42409b34b3aff118c7a09e390477247d002b' into kraken

* commit '853a42409b34b3aff118c7a09e390477247d002b':
  Do not check mWebTextView's focus state to determine editing mode.
2010-04-12 08:14:35 -07:00
Leon Scroggins
853a42409b am 63284ede: Do not check mWebTextView\'s focus state to determine editing mode.
Merge commit '63284ede623ca8a4119f1f44b86fbf017faba8dc' into froyo-plus-aosp

* commit '63284ede623ca8a4119f1f44b86fbf017faba8dc':
  Do not check mWebTextView's focus state to determine editing mode.
2010-04-12 08:11:40 -07:00
Leon Scroggins
63284ede62 Do not check mWebTextView's focus state to determine editing mode.
Fix for bug 2568400.

Change-Id: I7e285388484bbab3aef9b6f4bb190e001266ce53
2010-04-12 10:55:39 -04:00
Kristian Monsen
ab355380f0 Fix (again) for bug 2558156, update cache encoding correctly
My fault, the last fix did not fix the issue completly. Now setting the listener so the cache item can be found when the encoding is to be set by the background worker.

Change-Id: Iea514ada9b4f52760033daee66aa29cdceda1c9e
2010-04-12 12:07:30 +01:00
Wu-cheng Li
926d9a89ed am 08caa704: am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c' into kraken

* commit '08caa704ae6c1dd8434186fa2dc22b1d7f8a5f9c':
  Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
2010-04-10 11:48:24 -07:00
Dianne Hackborn
e1b462d76d am 06af7620: am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo
Merge commit '06af762033467bb578b9ed2be8af580cc11505a8' into kraken

* commit '06af762033467bb578b9ed2be8af580cc11505a8':
  Fix issue #2581524: Car home icon should always go to car home
2010-04-10 11:48:15 -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
Wei Huang
92671e5e4d am 997b3803: am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit '997b38036f5ac5db69191d090c8c3c1d1b05aace' into kraken

* commit '997b38036f5ac5db69191d090c8c3c1d1b05aace':
  bug #2542580: add the appropriate mdpi asset for chat icon.
2010-04-10 11:47:51 -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
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
Wu-cheng Li
08caa704ae am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
Merge commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp

* commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92':
  Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
2010-04-10 11:42:15 -07:00
Dianne Hackborn
06af762033 am 17de1532: Merge "Fix issue #2581524: Car home icon should always go to car home" into froyo
Merge commit '17de1532a950f7ee961debab93a7977292b7f1f3' into froyo-plus-aosp

* commit '17de1532a950f7ee961debab93a7977292b7f1f3':
  Fix issue #2581524: Car home icon should always go to car home
2010-04-10 11:42:05 -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
Wei Huang
997b38036f am c621b65d: Merge "bug #2542580: add the appropriate mdpi asset for chat icon." into froyo
Merge commit 'c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da' into froyo-plus-aosp

* commit 'c621b65d2f4ac88174fb98d2ed9a6b0d06fde4da':
  bug #2542580: add the appropriate mdpi asset for chat icon.
2010-04-10 11:41:45 -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
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
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