5503 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru
bcd20496e0 merge from open-source master 2009-11-08 17:03:30 -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
Android (Google) Code Review
96fce6e112 Merge change I62704736 into eclair
* changes:
  Do not apply light sensor debounce logic while the light sensor is still warming up.
2009-11-07 18:11:06 -08:00
Mike Lockwood
20ee6f2dd3 Do not apply light sensor debounce logic while the light sensor is still warming up.
This allows us to adjust immediately when we receive a correct light sensor reading
after the screen turns on.

Change-Id: I627047365640761727348e577c9164a6d6be2772
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-07 20:33:47 -05:00
Grace Kloba
d68c2f0d03 am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK.
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-plus-aosp

* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
  Remove "@hide pending API council" in webkit to expose
2009-11-07 10:56:25 -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
0eaa32279b am 638d8653: Merge change I47ef4266 into eclair
Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-plus-aosp

* commit '638d86535264b24b54698fca7e18e68571fe0bad':
  Expose WallpaperSettingsActivity in the public API.
2009-11-06 22:12:05 -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
Romain Guy
ecdcd16b4b am 9d790678: Merge change I32ce8591 into eclair
Merge commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b' into eclair-plus-aosp

* commit '9d790678bb83c829dddb9e4d0d6d6c4db7facc8b':
  Stop scrolling ListView when tapping a clickable item.
2009-11-06 18:36:25 -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
cc281f3e12 am 2b3970a2: Merge change Idc1396c8 into eclair
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-plus-aosp

* commit '2b3970a2956152a508254aa2675b68df363d46c1':
  Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
2009-11-06 14:06:11 -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
3fa188bccb am 8d51f710: Merge change Icdd2864e into eclair
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-plus-aosp

* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:32:53 -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
cd27c6ba22 am 49fa9e00: Merge change Ibf6e51b7 into eclair
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-plus-aosp

* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
  Set argv[0] from the main thread of an app, not a random binder thread
2009-11-06 13:02:44 -08: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
d1c0ecae60 am 3cba7288: Merge change I6ccd2ebc into eclair
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-plus-aosp

* commit '3cba72880b78b81cda2868136462c9e261a3e403':
  Expose PowerManager.isScreenOn in the public api.
2009-11-06 11:47:57 -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
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
Cary Clark
17a2d8b2a0 am 45011f2d: Merge change I4e9fe62b into eclair
Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-plus-aosp

* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
  do not merge -- original checkin to mr2 here:
2009-11-06 11:29:59 -08: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
Jared Suttles
bce53de0fa am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting
Merge commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f' into eclair-plus-aosp

* commit '8b1243e5e4930598e8e78ebd18e7b6cd6fb0445f':
  jni: GpsLocationProvider: Check for pending callbacks before waiting
2009-11-06 06:31:23 -08:00
Jared Suttles
8b1243e5e4 jni: GpsLocationProvider: Check for pending callbacks before waiting
This change fixes a corner case where a callback may not get handled until
a second callback arrives.  This can happen because there is a significant
section of the wait_for_event function where the mutex is not locked, and
the sPendingCallbacks member could be updated.  We now check to see if
there is a pending callback to handle before we wait for another callback.

Change-Id: I20cfae1e780944bb74133940dda032efc4c55540
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-06 08:28:58 -05:00
Dianne Hackborn
e0a8724d8a am 13bf8260: Fix SDK build: a few things missing, a link that was wrong.
Merge commit '13bf8260134d516cbcc982d360d9f21067f47fa6' into eclair-plus-aosp

* commit '13bf8260134d516cbcc982d360d9f21067f47fa6':
  Fix SDK build: a few things missing, a link that was wrong.
2009-11-05 21:58:46 -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
d91285b83b am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK
Merge commit '274b120f3975c8db6daeeab51a5fe08d6dede479' into eclair-plus-aosp

* commit '274b120f3975c8db6daeeab51a5fe08d6dede479':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK
2009-11-05 20:41:50 -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
b2e7ee9953 am 1d5b3a63: Fix the build
Merge commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0' into eclair-plus-aosp

* commit '1d5b3a631cfcbfd2ea264f29a11a1366a16593b0':
  Fix the build
2009-11-05 18:52:11 -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
35903e03ab am f20e9a88: Merge change Idf40f3b0 into eclair
Merge commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca' into eclair-plus-aosp

* commit 'f20e9a88a36ced533e96b8873a3321b4d51585ca':
  Prevent crash in Home when using widgets whose ids collide with Home's
2009-11-05 15:47:38 -08:00
Android (Google) Code Review
f20e9a88a3 Merge change Idf40f3b0 into eclair
* changes:
  Prevent crash in Home when using widgets whose ids collide with Home's resources.
2009-11-05 18:42:14 -05:00
Romain Guy
ae8dd29c03 Prevent crash in Home when using widgets whose ids collide with Home's
resources.

Bug #2228943.

Approved by mcleron, triaged by ryanpc.

Change-Id: Idf40f3b09502ae5d0d3b9a6a72c265a2de2ffca2
2009-11-05 15:40:35 -08:00
Jaikumar Ganesh
9d91706725 am 8de4e0ad: Merge change I21d0dca3 into eclair
Merge commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd' into eclair-plus-aosp

* commit '8de4e0ad8ff39d9a397cd80de5155d4c09ef98fd':
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 14:46:11 -08:00
Android (Google) Code Review
8de4e0ad8f Merge change I21d0dca3 into eclair
* changes:
  Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
2009-11-05 17:15:51 -05:00
Daniel Sandler
c10300235a am eca41b31: Merge change Id1458b01 into eclair
Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-plus-aosp

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.
2009-11-05 13:00:39 -08:00
Daniel Sandler
18a509d8fa New live wallpaper API to expose author and description strings.
First in a sequence of CLs to address
http://b/issue?id=2235307 .

Change-Id: Id1458b01c8a7918f345823b45e5726e02285d8b5
2009-11-05 15:05:27 -05:00
Jaikumar Ganesh
21d0dca33e Add BMW kits made by Motorola PCS to autoblack list for Bluetooth.
This may force some Motorola headsets to thow up the Pairing Request.

Bug: 2210365
Dr No: Eastham
2009-11-05 11:30:18 -08:00
Eric Laurent
d889f189b5 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:50 -08:00
Android (Google) Code Review
67b692920c Merge change I93f500a5 into eclair
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:55:26 -05:00
Eric Laurent
bda7469d9b Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
2009-11-04 23:47:21 -08:00
Romain Guy
075b09a149 am 131564d2: Merge change I3bbfb4f9 into eclair
Merge commit '131564d26ac5b7f963c60802089b9fe1472659f7' into eclair-plus-aosp

* commit '131564d26ac5b7f963c60802089b9fe1472659f7':
  Remove unused field and add new API to control the children drawing order.
2009-11-04 17:36:16 -08:00
Android (Google) Code Review
131564d26a Merge change I3bbfb4f9 into eclair
* changes:
  Remove unused field and add new API to control the children drawing order.
2009-11-04 19:58:00 -05:00
Romain Guy
293451e4f0 Remove unused field and add new API to control the children drawing order.
Approved by: xav, hackbod, mcleron.

Change-Id: I3bbfb4f96e3c9adedbb68d78703059a2df1e2013
2009-11-04 16:57:07 -08:00
Eric Olsen
5a301c0d17 am 9053fdb3: Merge change I76127f6f into eclair
Merge commit '9053fdb32b38d1240d856bd6efedf72eefba48d3' into eclair-plus-aosp

* commit '9053fdb32b38d1240d856bd6efedf72eefba48d3':
  Add support for colored LED on jogball backlight.
2009-11-04 16:46:49 -08:00