Commit Graph

4278 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
ac94fbd081 merge from open-source master 2009-11-09 11:00:18 -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
Grace Kloba
f7dec4a798 am d9e22ed8: am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK.
Merge commit 'd9e22ed8fe08c8c9fcf5c47a6b25d335a3158056' into eclair-mr2-plus-aosp

* commit 'd9e22ed8fe08c8c9fcf5c47a6b25d335a3158056':
  Remove "@hide pending API council" in webkit to expose
2009-11-07 11:06:46 -08:00
Charles Mendis
2689808c79 am 704af39c: am 638d8653: Merge change I47ef4266 into eclair
Merge commit '704af39c283060047441771e242d89fb3296bffb' into eclair-mr2-plus-aosp

* commit '704af39c283060047441771e242d89fb3296bffb':
  Expose WallpaperSettingsActivity in the public API.
2009-11-07 11:06:34 -08:00
Grace Kloba
d9e22ed8fe am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK.
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-mr2

* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
  Remove "@hide pending API council" in webkit to expose
2009-11-07 10:57:18 -08:00
Grace Kloba
0691ad50ca Remove "@hide pending API council" in webkit to expose
the apis to SDK.

Remove @hide in GeolocationPermissions and WebStorage
to expose them to the SDK users.

Remove @hide for freeMemory() in WebView.

Remove @hide comment in CallbackProxy and
GoogleLocationSettingManager as they are not public class.
2009-11-07 10:39:07 -08:00
Charles Mendis
704af39c28 am 638d8653: Merge change I47ef4266 into eclair
Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-mr2

* commit '638d86535264b24b54698fca7e18e68571fe0bad':
  Expose WallpaperSettingsActivity in the public API.
2009-11-06 22:12:16 -08:00
Android (Google) Code Review
638d865352 Merge change I47ef4266 into eclair
* changes:
  Expose WallpaperSettingsActivity in the public API.
2009-11-07 01:05:34 -05:00
Ray Chen
f02725e573 am d874afb8: Merge change I218bca82 into eclair-mr2
Merge commit 'd874afb84dd3933cb859df6ca10689982720765b' into eclair-mr2-plus-aosp

* commit 'd874afb84dd3933cb859df6ca10689982720765b':
  Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary.
2009-11-06 20:59:00 -08:00
Android (Google) Code Review
d874afb84d Merge change I218bca82 into eclair-mr2
* changes:
  Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary.
2009-11-06 23:53:51 -05:00
Romain Guy
795badaa93 am 83276b99: am 9d790678: Merge change I32ce8591 into eclair
Merge commit '83276b99987067938717b63d1b1763b168959ffe' into eclair-mr2-plus-aosp

* commit '83276b99987067938717b63d1b1763b168959ffe':
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 18:45:29 -08:00
Romain Guy
83276b9998 am 9d790678: Merge change I32ce8591 into eclair
Merge commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b' into eclair-mr2

* commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b':
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 18:35:40 -08:00
Android (Google) Code Review
9d790678bb Merge change I32ce8591 into eclair
* changes:
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 21:29:56 -05:00
Charles Mendis
47ef426679 Expose WallpaperSettingsActivity in the public API. 2009-11-06 18:06:06 -08:00
Romain Guy
4b4f40f84e Stop scrolling ListView when tapping a clickable item.
Bug #2210279.

Approved by mcleron.

Change-Id: I32ce8591b00fada95072513f5de69674b45e4cf3
2009-11-06 17:41:43 -08:00
Evan Millar
62ad899fa6 am 087c0603: am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp

* commit '087c06039faeac54aa3063b643c5a6aafe51aa30':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:21:24 -08:00
Evan Millar
087c06039f am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:04:18 -08:00
Android (Google) Code Review
2b3970a295 Merge change Idc1396c8 into eclair
* changes:
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 16:56:51 -05:00
Michael Chan
e4f5e840a3 am 811f6553: am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '811f655366461d0f21f970bcac07dd2084fd54fa' into eclair-mr2-plus-aosp

* commit '811f655366461d0f21f970bcac07dd2084fd54fa':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:42:02 -08:00
Christopher Tate
f5f452faca am 307fbbf2: am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1' into eclair-mr2-plus-aosp

* commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:34:59 -08:00
Dan Egnor
77be730ace am 883be83e: Merge change I2effb21e into eclair-mr2
Merge commit '883be83eab608237652e013b26fe871c18fa8901' into eclair-mr2-plus-aosp

* commit '883be83eab608237652e013b26fe871c18fa8901':
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 13:34:48 -08:00
Michael Chan
811f655366 am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:33:06 -08:00
Android (Google) Code Review
8d51f7101d Merge change Icdd2864e into eclair
* changes:
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 16:23:42 -05:00
Christopher Tate
307fbbf2b6 am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:22:54 -08:00
Android (Google) Code Review
883be83eab Merge change I2effb21e into eclair-mr2
* changes:
  Add UPDATE_ACTION to Gservices, used by the new checkin service.
2009-11-06 16:08:38 -05:00
Android (Google) Code Review
49fa9e0098 Merge change Ibf6e51b7 into eclair
* changes:
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 15:00:31 -05:00
Evan Millar
dc1396c881 Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Fixes http://b/issue?id=2178591
2009-11-06 11:59:39 -08:00
Charles Mendis
7e3873a0d2 am 6b07bf3d: am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp

* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:54:49 -08:00
Charles Mendis
6b07bf3d8f am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:46:43 -08:00
Android (Google) Code Review
3cba72880b Merge change I6ccd2ebc into eclair
* changes:
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 14:39:22 -05:00
Charles Mendis
322591cb4b Expose PowerManager.isScreenOn in the public api.
Change-Id: I6ccd2ebcbf3f8ad9ffa4b86a9c037cb0c25a7b78
2009-11-06 14:37:07 -05:00
Ken Shirriff
3b8ee3568a am 300160ed: Merge change I29a3be5b into eclair-mr2
Merge commit '300160edc936f2b8265900101136068e3912ff33' into eclair-mr2-plus-aosp

* commit '300160edc936f2b8265900101136068e3912ff33':
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 11:35:42 -08:00
Christopher Tate
8ee038d926 Set argv[0] from the main thread of an app, not a random binder thread
Change-Id: Ibf6e51b7975cdb5e6aa97591a571c599ecf84020
2009-11-06 11:30:20 -08:00
Ray Chen
f9a243d4a8 Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary. 2009-11-06 10:39:51 -08:00
Android (Google) Code Review
300160edc9 Merge change I29a3be5b into eclair-mr2
* changes:
  Calendar: add CALLER_IS_SYNCADAPTER parameter.
2009-11-06 13:23:27 -05:00
Cary Clark
4e9fe62b37 do not merge -- original checkin to mr2 here:
https://android-git.corp.google.com/g/#change,30204

check for native initialization before calling public function

Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.

These cases can be triggered by the monkey.

Fixes http://b/issue?id=2187719
2009-11-06 10:29:30 -05:00
Dianne Hackborn
78e502df51 am 892574f5: am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '892574f5f91b834f70ace880301db61f60d58362' into eclair-mr2-plus-aosp

* commit '892574f5f91b834f70ace880301db61f60d58362':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 22:02:56 -08:00
Dianne Hackborn
892574f5f9 am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-mr2

* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 21:57:51 -08:00
Dianne Hackborn
13bf826013 Fix SDK build: a few things missing, a link that was wrong.
Change-Id: I55c9c510b3f0866ce6085927afa00b9fb69dd8c5
2009-11-05 21:45:51 -08:00
Dianne Hackborn
85fdfd0144 am 237cc15c: am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '237cc15c171511e8c8ffe903c5d6f473593477b8' into eclair-mr2-plus-aosp

* commit '237cc15c171511e8c8ffe903c5d6f473593477b8':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:49:22 -08:00
Dianne Hackborn
237cc15c17 am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-mr2

* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:41:50 -08:00
Romain Guy
57e7109d13 am 15b9de8c: am 1d5b3a63: Fix the build
Merge commit '15b9de8cf217c315acb57044c43a9b12da57b6c4' into eclair-mr2-plus-aosp

* commit '15b9de8cf217c315acb57044c43a9b12da57b6c4':
  Fix the build
2009-11-05 20:37:29 -08:00
Dianne Hackborn
274b120f39 Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Change-Id: I7e996bf549922c1bb8e8c00d051650ffe12d818c
2009-11-05 20:35:23 -08:00
Romain Guy
15b9de8cf2 am 1d5b3a63: Fix the build
Merge commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0' into eclair-mr2

* commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0':
  Fix the build
2009-11-05 20:27:53 -08:00
Dan Egnor
2effb21e89 Add UPDATE_ACTION to Gservices, used by the new checkin service. 2009-11-05 20:08:49 -08:00
Romain Guy
1d5b3a631c Fix the build
Change-Id: Id7514858594772ab79c0f3db745b00f0bb59218b
2009-11-05 18:45:10 -08:00
Michael Chan
cdd2864eb3 b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth 2009-11-05 18:32:08 -08:00
Romain Guy
b25cb21f59 am 8426319c: am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98' into eclair-mr2-plus-aosp

* commit '8426319c5a5f4b6b7a1d5940e78d3fc717c36d98':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 15:57:49 -08:00
Jaikumar Ganesh
cc2d3572e9 am f53f86a7: am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0' into eclair-mr2-plus-aosp

* commit 'f53f86a743a91b4383e480dcf44a8e7b16ca7fa0':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 15:50:11 -08:00
Romain Guy
8426319c5a am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-mr2

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 15:47:43 -08:00