Commit Graph

5335 Commits

Author SHA1 Message Date
Dianne Hackborn
f4857040d4 am 7377ac4f: am a3006256: am 119a7675: Merge change I83ba96fe into eclair
Merge commit '7377ac4fa5922f29f18c9584effe41ccd48cb641'

* commit '7377ac4fa5922f29f18c9584effe41ccd48cb641':
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 11:02:31 -08:00
Dianne Hackborn
7377ac4fa5 am a3006256: am 119a7675: Merge change I83ba96fe into eclair
Merge commit 'a300625625feae9f7eb28694e4a31335442c420b' into eclair-mr2-plus-aosp

* commit 'a300625625feae9f7eb28694e4a31335442c420b':
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 11:00:00 -08:00
Dianne Hackborn
a300625625 am 119a7675: Merge change I83ba96fe into eclair
Merge commit '119a767565399809d222ddda6392e5e58942d5e6' into eclair-mr2

* commit '119a767565399809d222ddda6392e5e58942d5e6':
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 10:52:51 -08:00
Android (Google) Code Review
119a767565 Merge change I83ba96fe into eclair
* changes:
  Fix issue #2246723: Only one Application object gets onCreate called
2009-11-10 10:27:05 -08:00
Scott Main
94a63f40fb am 8e5cee5d: am b262f50a: am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '8e5cee5d26cfb08e72199280a4be86e9f85c43fe'

* commit '8e5cee5d26cfb08e72199280a4be86e9f85c43fe':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:50:31 -08:00
Scott Main
8e5cee5d26 am b262f50a: am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56' into eclair-mr2-plus-aosp

* commit 'b262f50af9ad22837af9e88e6c8f71b44cdefd56':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:44:19 -08:00
Scott Main
b262f50af9 am 13ce56bd: am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '13ce56bdbc4872c0b12caff501e063f5a75073db' into eclair-mr2

* commit '13ce56bdbc4872c0b12caff501e063f5a75073db':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:40:48 -08:00
Scott Main
13ce56bdbc am 88427cff: Merge change Ibcfb7d10 into eclair-sdk
Merge commit '88427cff609e668185010af2244500be5823595e' into eclair

* commit '88427cff609e668185010af2244500be5823595e':
  docs: add more documentation for the bluetooth apis.
2009-11-10 09:26:24 -08:00
Marco Nelissen
430785f66d am eac4222f: am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair
Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'

* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:42:13 -08:00
Marco Nelissen
eac4222f7f am 949ffa3d: am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp

* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:38:31 -08:00
Marco Nelissen
949ffa3da5 am 11cff8cd: Merge change Ie211adae into eclair
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2

* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
  Add a way for wallpapers to know the delta between virtual screens.
2009-11-09 19:34:42 -08:00
Scott Main
9fab0aef19 docs: add more documentation for the bluetooth apis.
more descriptions for some of the classes and a new
overview and pseudo-code example for using BT APIs
in the package summary.
2009-11-09 18:09:12 -08:00
Marco Nelissen
bf6956b1d9 Add a way for wallpapers to know the delta between virtual screens. 2009-11-09 17:39:33 -08:00
Daisuke Miyakawa
92885e0328 am 9e0da5bd: am 452a5296: Merge change I319bf9ee into eclair-mr2
Merge commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990'

* commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990':
  Make vCard exporter check invalid phone numbers and re-format them if needed.
2009-11-09 16:42:56 -08:00
Daisuke Miyakawa
9e0da5bd2d am 452a5296: Merge change I319bf9ee into eclair-mr2
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp

* commit '452a52968f43c21e9a040009e209df023a34876c':
  Make vCard exporter check invalid phone numbers and re-format them if needed.
2009-11-09 16:39:33 -08:00
Android (Google) Code Review
452a52968f Merge change I319bf9ee into eclair-mr2
* changes:
  Make vCard exporter check invalid phone numbers and re-format them if needed.
2009-11-09 16:35:44 -08:00
Bjorn Bringert
7ebdc03a95 am e3dc9f49: am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit 'e3dc9f491a8e9f9cdc6f7815be9ece4c87ebe8a4'

* commit 'e3dc9f491a8e9f9cdc6f7815be9ece4c87ebe8a4':
  Fix code example in Parcelable javadoc
2009-11-09 16:30:18 -08:00
Dianne Hackborn
fc19a92334 am 794bfed0: am 2934bc1c: am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '794bfed0b9d8fded77cf096213cfb36cf43189ba'

* commit '794bfed0b9d8fded77cf096213cfb36cf43189ba':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:29:48 -08:00
Daisuke Miyakawa
f2ad61c83d Make vCard exporter check invalid phone numbers and re-format them if needed.
Also add a unit test for the case.

Internal issue number: 2246410
2009-11-10 09:29:04 +09:00
Bjorn Bringert
e3dc9f491a am e8341ebb: am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp

* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
  Fix code example in Parcelable javadoc
2009-11-09 16:24:46 -08:00
Dianne Hackborn
794bfed0b9 am 2934bc1c: am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '2934bc1c438b6f00942dcc5c18cbe7ecfa8785c0' into eclair-mr2-plus-aosp

* commit '2934bc1c438b6f00942dcc5c18cbe7ecfa8785c0':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:24:26 -08:00
Bjorn Bringert
e8341ebbc6 am 2bb53754: Merge change Icaf932d0 into eclair
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2

* commit '2bb53754337225508f2b4d12f1575df7c226100c':
  Fix code example in Parcelable javadoc
2009-11-09 16:15:05 -08:00
Dianne Hackborn
2934bc1c43 am 644693f4: Merge change Ic42763b1 into eclair
Merge commit '644693f4caf2364a0e811dca13304788e2c8fee8' into eclair-mr2

* commit '644693f4caf2364a0e811dca13304788e2c8fee8':
  Fix issue #2242440: Window screen brightness attribute is broken
2009-11-09 16:14:38 -08:00
Cynthia Wong
7e6422c1cc am 6720bb83: am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88'

* commit '6720bb8314600a2b55a18159b4a22dc4b18aec88':
  new gservices flag for delaying bad gmail operations
2009-11-09 14:14:55 -08:00
Derek Sollenberger
6f240aec18 am 29c00b0f: am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'

* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
  Allow plugins to load java classes from their apk.
2009-11-09 13:51:18 -08:00
Cynthia Wong
6720bb8314 am 26c91fa6: Merge change I4ff96000 into eclair-mr2
Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp

* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
  new gservices flag for delaying bad gmail operations
2009-11-09 13:26:00 -08:00
Android (Google) Code Review
26c91fa694 Merge change I4ff96000 into eclair-mr2
* changes:
  new gservices flag for delaying bad gmail operations
2009-11-09 13:23:23 -08:00
Derek Sollenberger
29c00b0f09 am 521123e0: Merge change I9e28c4ce into eclair-mr2
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp

* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
  Allow plugins to load java classes from their apk.
2009-11-09 12:45:29 -08:00
Android (Google) Code Review
521123e0ed Merge change I9e28c4ce into eclair-mr2
* changes:
  Allow plugins to load java classes from their apk.
2009-11-09 12:42:35 -08:00
Dianne Hackborn
0be1f78c97 Fix issue #2246723: Only one Application object gets onCreate called
Change-Id: I83ba96fe81ad04258099d6f94a667dc7d9dd4fd3
2009-11-09 12:30:12 -08:00
Grace Kloba
22e7d825b8 am 977e8d28: am e81c9609: Merge change I8c92c39b into eclair-mr2
Merge commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb'

* commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb':
  Add postdata identifier so that if we cache the post
2009-11-09 12:12:35 -08:00
Daisuke Miyakawa
6ddfe00729 am c53cc103: am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'

* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:12:24 -08:00
Daisuke Miyakawa
27700b7c19 am 75face7d: am df0ce741: Merge change I8c0747cf into eclair-mr2
Merge commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35'

* commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35':
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-09 12:12:13 -08:00
Jeff Sharkey
1cbbec066d am 4024c46f: am 06dc03f2: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '4024c46f91564ac49e022c5fcef85b8c6dba150b'

* commit '4024c46f91564ac49e022c5fcef85b8c6dba150b':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-09 12:11:54 -08:00
Jean-Baptiste Queru
3c08b74155 am ac94fbd0: merge from open-source master
Merge commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0'

* commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0':
  Capture failure of copybit->stretch()
  Fix obvious typo bug in egl.cpp
  LocationManagerService: Fix race when removing LocationListener
  Don't return when blocking is true.
  Fix of compatibility with multifunction extUSB adapters.
  Fix documentation example, per issue 895 on android.googlecode.com
2009-11-09 12:08:48 -08:00
Grace Kloba
977e8d28e5 am e81c9609: Merge change I8c92c39b into eclair-mr2
Merge commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2' into eclair-mr2-plus-aosp

* commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2':
  Add postdata identifier so that if we cache the post
2009-11-09 12:04:15 -08:00
Daisuke Miyakawa
c53cc10390 am 0e983864: Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and "AGENT" line.
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp

* commit '0e983864fca215513de9664573dcc3bbadf41e79':
  Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
2009-11-09 12:04:03 -08:00
Daisuke Miyakawa
75face7d2d am df0ce741: Merge change I8c0747cf into eclair-mr2
Merge commit 'df0ce74126e75963a33201b6c98ce46837a2e55e' into eclair-mr2-plus-aosp

* commit 'df0ce74126e75963a33201b6c98ce46837a2e55e':
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-09 12:03:53 -08:00
Jeff Sharkey
4024c46f91 am 06dc03f2: Let RemoteViews nest children, allow ViewFlipper.
Merge commit '06dc03f2cf98862717ba1aa0e858897363abc369' into eclair-mr2-plus-aosp

* commit '06dc03f2cf98862717ba1aa0e858897363abc369':
  Let RemoteViews nest children, allow ViewFlipper.
2009-11-09 12:03:40 -08:00
Derek Sollenberger
9e28c4ce66 Allow plugins to load java classes from their apk.
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.

see http://b/2215696
2009-11-09 14:45:58 -05:00
Jean-Baptiste Queru
ac94fbd081 merge from open-source master 2009-11-09 11:00:18 -08:00
Android (Google) Code Review
e81c9609cc Merge change I8c92c39b into eclair-mr2
* changes:
  Add postdata identifier so that if we cache the post result, we will use (url+postIdentifier) as the key for the CacheResult.
2009-11-09 10:01:04 -08:00
Cynthia Wong
4ff960006f new gservices flag for delaying bad gmail operations 2009-11-09 09:42:14 -08:00
Android (Google) Code Review
2bb5375433 Merge change Icaf932d0 into eclair
* changes:
  Fix code example in Parcelable javadoc
2009-11-09 08:09:35 -08:00
Daisuke Miyakawa
0e983864fc Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
"AGENT" line.

Internal Issue number: 2247192
2009-11-09 15:34:55 +09:00
Grace Kloba
8c92c39b85 Add postdata identifier so that if we cache the post
result, we will use (url+postIdentifier) as the key
for the CacheResult.

Fix http://b/issue?id=1980031
2009-11-08 19:01:55 -08:00
Android (Google) Code Review
df0ce74126 Merge change I8c0747cf into eclair-mr2
* changes:
  Make vCard parser invalid lines in vCard file which look like some comment.
2009-11-08 18:34:23 -08:00
Dianne Hackborn
badc47ecd1 Fix issue #2242440: Window screen brightness attribute is broken
Um okay, that was dumb.  And I guess this means it is time to make 6.xml.

Change-Id: Ic42763b1c8a13448cf6db20b4cd6daadc7786ac1
2009-11-08 17:37:50 -08:00
Jeff Sharkey
06dc03f2cf Let RemoteViews nest children, allow ViewFlipper.
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews.  These nested views
are inflated and treated as addView() calls.

This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen.

Fixes http://b/2239905
2009-11-08 14:14:40 -08:00
Android Code Review
4d88cbd98e Merge change Ia01d5fe8
* changes:
  Fix documentation example, per issue 895 on android.googlecode.com
2009-11-08 12:33:19 -08:00