Commit Graph

5284 Commits

Author SHA1 Message Date
Fred Quintana
be62ddd4ee resolved conflicts for merge of eb393ce8 to master 2009-11-23 15:36:25 -08:00
Fred Quintana
eb393ce8ee am 4174016d: Merge change I53e3a20e into eclair-mr2
Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp

* commit '4174016dbd043eda493e9cd1925ed84549c7b3c0':
  move SubscribedFeeds to GSF
2009-11-23 13:47:00 -08:00
Android (Google) Code Review
4174016dbd Merge change I53e3a20e into eclair-mr2
* changes:
  move SubscribedFeeds to GSF
2009-11-23 13:42:24 -08:00
Mike Lockwood
4ddc2ed883 am fa351d38: am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'fa351d388d0441432f4e616ef87a5c97a088dd04'

* commit 'fa351d388d0441432f4e616ef87a5c97a088dd04':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:18:19 -08:00
Fred Quintana
53e3a20e41 move SubscribedFeeds to GSF 2009-11-23 13:18:07 -08:00
Mike Lockwood
fa351d388d am e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp

* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 13:13:39 -08:00
Android (Google) Code Review
e5683369d2 Merge change I60dfecdc into eclair-mr2
* changes:
  Add window manager support for overriding button and keyboard backlight values.
2009-11-23 12:20:04 -08:00
Grace Kloba
543d9ca0cc am f40abf42: am ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit 'f40abf427e614b850dfb3723622af3e6039a9815'

* commit 'f40abf427e614b850dfb3723622af3e6039a9815':
  Expose some debugging tools of the WebView.
2009-11-23 12:17:33 -08:00
Mike Lockwood
fb73f79340 Add window manager support for overriding button and keyboard backlight values.
The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field

Needed for bugs:
    b/2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout)
    b/2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode)

Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
2009-11-23 15:16:55 -05:00
Grace Kloba
f40abf427e am ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp

* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
  Expose some debugging tools of the WebView.
2009-11-23 12:12:52 -08:00
Android (Google) Code Review
ed1624d8ff Merge change I8ae1b41a into eclair-mr2
* changes:
  Expose some debugging tools of the WebView.
2009-11-23 12:07:20 -08:00
Grace Kloba
8ae1b41a43 Expose some debugging tools of the WebView. 2009-11-23 10:35:34 -08:00
Jaikumar Ganesh
4f4fdf6dc3 am 09e27c4a: am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3'

* commit '09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3':
  Fix pairings lost on reboot.
2009-11-22 22:17:07 -08:00
Jaikumar Ganesh
09e27c4a9c am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp

* commit '8631e55425b2ab81eb74396e6834c6f7a4549804':
  Fix pairings lost on reboot.
2009-11-22 22:10:15 -08:00
Jaikumar Ganesh
8631e55425 am ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2

* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
  Fix pairings lost on reboot.
2009-11-22 22:02:17 -08:00
Android (Google) Code Review
ad431ad863 Merge change Ia3acc2ee into eclair
* changes:
  Fix pairings lost on reboot.
2009-11-22 21:54:29 -08:00
Dianne Hackborn
5d3ac273b0 am 131a5ee9: am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '131a5ee9aeadb9057847a437a669dd61573f5c88'

* commit '131a5ee9aeadb9057847a437a669dd61573f5c88':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:54:36 -08:00
Dianne Hackborn
131a5ee9ae am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11' into eclair-mr2-plus-aosp

* commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:49:21 -08:00
Dianne Hackborn
dbf3d3acc1 am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2

* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
  Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
2009-11-20 16:43:20 -08:00
Dianne Hackborn
af1f42be96 Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
The detach of the wallpaper engine was coming in after the containing
service was destroyed.  This was possible because these are different
IPC interfaces so will not be serialized.  The fix is to keep track
of all of the active engines in the serice, and detach any remaining
ones when the service is destroyed.

Change-Id: I8810786a777dd4f7b15cfbd2e0da25866a4f3ec5
2009-11-20 16:27:27 -08:00
Ken Shirriff
710ac46b0d am 10a02fb7: am f8c2bb36: Add gservices flags for calendar sync.
Merge commit '10a02fb7e44dfd50132386e04f39b35b00b84e0e'

* commit '10a02fb7e44dfd50132386e04f39b35b00b84e0e':
  Add gservices flags for calendar sync.
2009-11-20 14:40:48 -08:00
Ken Shirriff
10a02fb7e4 am f8c2bb36: Add gservices flags for calendar sync.
Merge commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4' into eclair-mr2-plus-aosp

* commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4':
  Add gservices flags for calendar sync.
2009-11-20 14:35:22 -08:00
Ken Shirriff
f8c2bb36f7 Add gservices flags for calendar sync. 2009-11-20 14:27:58 -08:00
Vasu Nori
8914a04b16 am 483ae632: am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '483ae6328701d29e9731af25c64b09b1e18bc2e7'

* commit '483ae6328701d29e9731af25c64b09b1e18bc2e7':
  maintain cache of statementids returned by sqlite upon compiling a sql stmnt
2009-11-20 14:19:49 -08:00
Vasu Nori
483ae63287 am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp

* commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af':
  maintain cache of statementids returned by sqlite upon compiling a sql stmnt
2009-11-20 14:14:45 -08:00
Vasu Nori
5a03f36ef8 maintain cache of statementids returned by sqlite upon compiling a sql stmnt 2009-11-20 14:09:24 -08:00
Jaikumar Ganesh
b148bc844e Fix pairings lost on reboot.
Bug:2277376
Dr No:Eastham
2009-11-20 13:50:26 -08:00
Scott Main
798e043986 am 7dba47c8: am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '7dba47c866b126d26dec2afe18164ce73016bc46'

* commit '7dba47c866b126d26dec2afe18164ce73016bc46':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:10:49 -08:00
Scott Main
7dba47c866 am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp

* commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:05:56 -08:00
Scott Main
cb5966426a am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2

* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 10:00:28 -08:00
Mike Lockwood
347ed410c2 am 9d633968: am 401a712e: IPowerManager: remove some unused methods.
Merge commit '9d633968ceb502e95f9785b169742624f72614f5'

* commit '9d633968ceb502e95f9785b169742624f72614f5':
  IPowerManager: remove some unused methods.
2009-11-20 10:00:16 -08:00
Mike Lockwood
9d633968ce am 401a712e: IPowerManager: remove some unused methods.
Merge commit '401a712e3b3b41c77e79a130d7b07d653e18bcab' into eclair-mr2-plus-aosp

* commit '401a712e3b3b41c77e79a130d7b07d653e18bcab':
  IPowerManager: remove some unused methods.
2009-11-20 09:56:25 -08:00
Scott Main
e16113998b am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair

* commit '6d95fc0a2ca910212a43c4547c0ef000659b72dc':
  docs for ESR: add docs to bluetooth explainin that discovery should
2009-11-20 09:54:22 -08:00
Mike Lockwood
401a712e3b IPowerManager: remove some unused methods.
Change-Id: I7c7fa7eaf6c99e723da20939c27fbc172ad51613
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-11-20 11:50:21 -05:00
Ben Murdoch
fda04eb9aa am c26197e0: am 7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit 'c26197e02cb0dc76d7d621f88f120c1ccfc31c25'

* commit 'c26197e02cb0dc76d7d621f88f120c1ccfc31c25':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
2009-11-20 02:24:03 -08:00
Ben Murdoch
c26197e02c am 7caaeecc: Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
Merge commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0' into eclair-mr2-plus-aosp

* commit '7caaeecce1b04e2098dd4f471fdd69ebe28c31b0':
  Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
2009-11-20 02:20:02 -08:00
Ben Murdoch
7caaeecce1 Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
BUG=b/2271636

Change-Id: Ia9bed430c624c4c3745904c98fb2e27632d929f9
2009-11-20 10:14:46 +00:00
Daisuke Miyakawa
7fee29dafd am 4ee476ef: am 5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '4ee476ef94f7834c18ee378c788abcdb0728954f'

* commit '4ee476ef94f7834c18ee378c788abcdb0728954f':
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:23:38 -08:00
Daisuke Miyakawa
4ee476ef94 am 5e332efd: Merge change I903ce7b1 into eclair-mr2
Merge commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7' into eclair-mr2-plus-aosp

* commit '5e332efd56ffc8bcc6c40b214aca66bec21648b7':
  Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
2009-11-19 23:19:32 -08:00
Daisuke Miyakawa
a750fdd765 Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Internal issue number: 2195990
2009-11-20 16:13:07 +09:00
Doug Zongker
81e3048020 am 043c7276: am 6fd4e76c: fix bad link in javadoc that\'s breaking SDK build
Merge commit '043c72766248d0a4783c506fd4f604ed63e763d4'

* commit '043c72766248d0a4783c506fd4f604ed63e763d4':
  fix bad link in javadoc that's breaking SDK build
2009-11-19 18:30:14 -08:00
Dianne Hackborn
187f0749b8 am 79374643: am b9ab7126: am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '7937464319133d478d5e8b386e9d08668eddd8a9'

* commit '7937464319133d478d5e8b386e9d08668eddd8a9':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:29:46 -08:00
Doug Zongker
043c727662 am 6fd4e76c: fix bad link in javadoc that\'s breaking SDK build
Merge commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08' into eclair-mr2-plus-aosp

* commit '6fd4e76ca1866772d125089e8f2e3f1d54fcae08':
  fix bad link in javadoc that's breaking SDK build
2009-11-19 18:23:52 -08:00
Dianne Hackborn
7937464319 am b9ab7126: am 524812fb: Merge change I7d40ad9a into eclair
Merge commit 'b9ab71263ebff601a7c5e00258d92493de85fb36' into eclair-mr2-plus-aosp

* commit 'b9ab71263ebff601a7c5e00258d92493de85fb36':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:23:31 -08:00
Doug Zongker
6fd4e76ca1 fix bad link in javadoc that's breaking SDK build 2009-11-19 18:17:15 -08:00
Dianne Hackborn
b9ab71263e am 524812fb: Merge change I7d40ad9a into eclair
Merge commit '524812fbf583db5053ff56f7a146fa8fe9296742' into eclair-mr2

* commit '524812fbf583db5053ff56f7a146fa8fe9296742':
  More on issue #2271640: Fix wallpaper etc docs
2009-11-19 18:06:06 -08:00
Doug Zongker
608620da67 am a7ad3f6c: am 50a21f4d: add reboot() method to PowerManager
Merge commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0'

* commit 'a7ad3f6c71ad6701fcaa6ecf75452563addb0dd0':
  add reboot() method to PowerManager
2009-11-19 17:45:39 -08:00
Daisuke Miyakawa
35e3d527d3 am 1b3a7b43: am eb114de5: Merge change I639b0f03 into eclair-mr2
Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'

* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
  Make vCard exporter append neighborhood to locality field instead of extended address,
2009-11-19 17:42:27 -08:00
Grace Kloba
42328e3a1f am 3003f30d: am 98fdda09: Merge change I86773fbb into eclair-mr2
Merge commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601'

* commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601':
  If overview width is the same as the current width,
2009-11-19 17:41:56 -08:00
Steve Block
cfdd6cd352 am 74dcb02f: am 57534f1b: Improves documentation for GeolocationPermissions class.
Merge commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72'

* commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72':
  Improves documentation for GeolocationPermissions class.
2009-11-19 17:41:13 -08:00