Commit Graph

5306 Commits

Author SHA1 Message Date
Jaikumar Ganesh
2c393d517b am 0647b580: Merge change 25970 into eclair
Merge commit '0647b580aa7874311fc77b659e4f646750ddd74e' into eclair-plus-aosp

* commit '0647b580aa7874311fc77b659e4f646750ddd74e':
  Make removeBond() call async.
2009-09-20 13:18:35 -07:00
Christopher Tate
dd387aa62a am 3a66413a: Merge change 25992 into eclair
Merge commit '3a66413af33f2f2a3511f644efe5b4e45198d7df' into eclair-plus-aosp

* commit '3a66413af33f2f2a3511f644efe5b4e45198d7df':
  Add an 'init everything' operation to the first backup pass
2009-09-20 13:18:26 -07:00
Android (Google) Code Review
03268374fe Merge change 25970 into eclair
* changes:
  Make removeBond() call async.
2009-09-20 16:14:54 -04:00
Android (Google) Code Review
8afe0f3d51 Merge change 25992 into eclair
* changes:
  Add an 'init everything' operation to the first backup pass
2009-09-20 16:10:59 -04:00
Dianne Hackborn
cfbb735f84 Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Also a little improved debugging output of bad resource identifiers.

Change-Id: I054064ef22855608ffd722e4ccf12ce57d1992b2
2009-09-20 12:40:03 -07:00
Debajit Ghosh
c0031b2bfd am 7d9db612: Merge change 25885 into eclair
Merge commit '7d9db612bdecad3d6667858ac296f5ede27aabfa' into eclair-plus-aosp

* commit '7d9db612bdecad3d6667858ac296f5ede27aabfa':
  handle calendars with an access level of "root"
2009-09-20 12:21:50 -07:00
Android (Google) Code Review
23b0b2d636 Merge change 25885 into eclair
* changes:
  handle calendars with an access level of "root"
2009-09-20 15:14:16 -04:00
Christopher Tate
7da9073ee2 am d163f4ba: Merge change 25853 into eclair
Merge commit 'd163f4babe101b89aaf322c34d3bafeae237f7da' into eclair-plus-aosp

* commit 'd163f4babe101b89aaf322c34d3bafeae237f7da':
  Don't back up / restore certain sync-related settings
2009-09-20 10:33:53 -07:00
Android (Google) Code Review
ed89b3f913 Merge change 25853 into eclair
* changes:
  Don't back up / restore certain sync-related settings
2009-09-20 13:28:41 -04:00
Karl Rosaen
3d363998f5 am 9603715a: Merge change 25959 into eclair
Merge commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70' into eclair-plus-aosp

* commit '9603715ae3813290dcf18f2f6a3fb5299dc27a70':
  Add better transition to rotary lock widget when triggering: spin around instead of snap back.
2009-09-20 10:05:36 -07:00
Android (Google) Code Review
5ba2d8627b Merge change 25959 into eclair
* changes:
  Add better transition to rotary lock widget when triggering: spin around instead of snap back.
2009-09-20 12:59:59 -04:00
Dmitri Plotnikov
da2958fe50 am eb96a3c3: Merge change 25894 into eclair
Merge commit 'eb96a3c3d3707167c9571f7dd7729782e747518e' into eclair-plus-aosp

* commit 'eb96a3c3d3707167c9571f7dd7729782e747518e':
  Adding CONTENT_TYPE to CommonDataKinds.Email
2009-09-20 07:54:42 -07:00
Robert Greenwalt
fbd9480cfb am 4492bcd8: Merge change 25938 into eclair
Merge commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30' into eclair-plus-aosp

* commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30':
  Don't require WAKE_LOCK permission to enable wifi
2009-09-20 07:54:33 -07:00
Android (Google) Code Review
292ccb6695 Merge change 25894 into eclair
* changes:
  Adding CONTENT_TYPE to CommonDataKinds.Email
2009-09-20 10:49:05 -04:00
Android (Google) Code Review
5cec758506 Merge change 25938 into eclair
* changes:
  Don't require WAKE_LOCK permission to enable wifi
2009-09-20 10:48:09 -04:00
Mike Lockwood
2b76b670b1 am b4c0b3d8: Add resources to allow forcing accelerometer based orientation management when docked.
Merge commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6' into eclair-plus-aosp

* commit 'b4c0b3d8ccbadca9d4e8a0e5c50a4549f2c84bf6':
  Add resources to allow forcing accelerometer based orientation management when docked.
2009-09-20 06:03:14 -07:00
Mike Lockwood
d3d9749199 am b8155068: Merge change 25944 into eclair
Merge commit 'b8155068ef855147d86465817be2660a5212a6bb' into eclair-plus-aosp

* commit 'b8155068ef855147d86465817be2660a5212a6bb':
  Wake the screen if the proximity wakelock is released while the proximity sensor is active.
2009-09-19 21:33:32 -07:00
Mike LeBeau
31a227d3f1 am 2b1cfef1: Merge change 25937 into eclair
Merge commit '2b1cfef19efb11d283a08042d37a326141c28429' into eclair-plus-aosp

* commit '2b1cfef19efb11d283a08042d37a326141c28429':
  Change the broadcast intent for dock state changes from a sticky broadcast to
2009-09-19 21:33:23 -07:00
Android (Google) Code Review
48101b1f7d Merge change 25944 into eclair
* changes:
  Wake the screen if the proximity wakelock is released while the proximity sensor is active.
2009-09-20 00:27:28 -04:00
Android (Google) Code Review
0d0a0b95a4 Merge change 25937 into eclair
* changes:
  Change the broadcast intent for dock state changes from a sticky broadcast to a sticky ordered broadcast. This is so individual apps can override the default behavior and stop the related dock app from launching.
2009-09-20 00:24:44 -04:00
Daisuke Miyakawa
6eb7325e9f am 927b86f3: Add config_use_strict_phone_number_comparation, which will be used by internal applications.
Merge commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c' into eclair-plus-aosp

* commit '927b86f3a7bdf419dea40ecdfaa6678517d8593c':
  Add config_use_strict_phone_number_comparation, which will be used by internal applications.
2009-09-19 18:57:16 -07:00
Daisuke Miyakawa
76a6ea6955 am 9a24bc56: Implement compareStrictly() using phone_number_compare() written in C.
Merge commit '9a24bc563f28d8489c7178b93ff05f02e8b8a893' into eclair-plus-aosp

* commit '9a24bc563f28d8489c7178b93ff05f02e8b8a893':
  Implement compareStrictly() using phone_number_compare() written in C.
2009-09-19 15:47:03 -07:00
Dianne Hackborn
81e63617db am e69335f8: Merge change 25931 into eclair
Merge commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760' into eclair-plus-aosp

* commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760':
  Add better APIs for the battery status, and other cleanup.
2009-09-19 14:21:31 -07:00
Android (Google) Code Review
ebb1abe054 Merge change 25931 into eclair
* changes:
  Add better APIs for the battery status, and other cleanup.
2009-09-19 17:13:23 -04:00
Dianne Hackborn
a154888864 am a382cb81: Merge change 25929 into eclair
Merge commit 'a382cb81187437aa389dc131687e181ceaefa8ba' into eclair-plus-aosp

* commit 'a382cb81187437aa389dc131687e181ceaefa8ba':
  Add API to send an ordered sticky broadcast.
2009-09-19 12:29:56 -07:00
Android (Google) Code Review
bf1d74e3c7 Merge change 25929 into eclair
* changes:
  Add API to send an ordered sticky broadcast.
2009-09-19 15:22:19 -04:00
Jaikumar Ganesh
a93c4b58e7 am ac810e53: Merge change 25779 into eclair
Merge commit 'ac810e53b70aa01c148c998c57f6888160e1557a' into eclair-plus-aosp

* commit 'ac810e53b70aa01c148c998c57f6888160e1557a':
  Add new API for fetching UUIDs using SDP.
2009-09-19 11:37:48 -07:00
Android (Google) Code Review
05a83cde1f Merge change 25779 into eclair
* changes:
  Add new API for fetching UUIDs using SDP.
2009-09-19 14:30:37 -04:00
Nicolas Catania
7fd3fe5a7b am 338c4855: Moved the toString method in the parent Connection class.
Merge commit '338c48554f35dbee3faa4e39525a972f20a7c32d' into eclair-plus-aosp

* commit '338c48554f35dbee3faa4e39525a972f20a7c32d':
  Moved the toString method in the parent Connection class.
2009-09-19 07:57:57 -07:00
Mike LeBeau
eb270d9cf4 am ba9bf79d: Merge change 25911 into eclair
Merge commit 'ba9bf79d49f25577998ddac8bb7026ee52583810' into eclair-plus-aosp

* commit 'ba9bf79d49f25577998ddac8bb7026ee52583810':
  Unhide attributes textAppearanceSearchResultSubtitle and
2009-09-19 01:36:44 -07:00
Android (Google) Code Review
4a43004287 Merge change 25911 into eclair
* changes:
  Unhide attributes textAppearanceSearchResultSubtitle and attr/textAppearanceSearchResultTitle. We had discussed doing this in Donut but looks like it never happened. We need these attributes for voice search so now's as good a time as any.
2009-09-19 04:29:22 -04:00
Grace Kloba
b567c248a6 am 22bfcbca: Merge change 25831 into eclair
Merge commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00' into eclair-plus-aosp

* commit '22bfcbca4f9f4e88dee120c5bf71545f40289e00':
  When double tap zoom out to overview mode, force reveal the full
2009-09-18 23:16:45 -07:00
Android (Google) Code Review
cff2f77664 Merge change 25831 into eclair
* changes:
  When double tap zoom out to overview mode, force reveal the full title bar if it is partial visible.
2009-09-19 02:09:44 -04:00
Yu Shan Emily Lau
07dcb2eede am 92b27daf: Merge change 25858 into eclair
Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp

* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
2009-09-18 20:13:31 -07:00
Android (Google) Code Review
658881ff08 Merge change 25858 into eclair
* changes:
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
2009-09-18 23:07:00 -04:00
Dmitri Plotnikov
676fd661e7 am 4b5e7d90: Merge change 25874 into eclair
Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp

* commit '4b5e7d908bfda633fea72f5d20dae63328019c93':
  ContactsContract: Adding joined columns to the CommonDataKind class definitions.
2009-09-18 19:39:41 -07:00
Android (Google) Code Review
1da36c076d Merge change 25874 into eclair
* changes:
  ContactsContract: Adding joined columns to the CommonDataKind class definitions.
2009-09-18 22:31:54 -04:00
Jack Palevich
7dca3e094d am cd0aceb7: Merge change 25883 into eclair
Merge commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d' into eclair-plus-aosp

* commit 'cd0aceb710fc3b62a238992ceef628e359ee1e7d':
  Draw a green triangle using OpenGL 2.0 APIs.
2009-09-18 18:37:38 -07:00
Android (Google) Code Review
8563a27de1 Merge change 25883 into eclair
* changes:
  Draw a green triangle using OpenGL 2.0 APIs.
2009-09-18 21:30:35 -04:00
Jack Palevich
9ec24af0e8 Draw a green triangle using OpenGL 2.0 APIs. 2009-09-18 18:27:37 -07:00
Dianne Hackborn
e6505d040c am 84ab79c7: Merge change 25873 into eclair
Merge commit '84ab79c7f0263f5f5748d3c1ad0d0feedad604cc' into eclair-plus-aosp

* commit '84ab79c7f0263f5f5748d3c1ad0d0feedad604cc':
  Fix transformation on windows.
2009-09-18 18:03:41 -07:00
Android (Google) Code Review
759ff0fa02 Merge change 25873 into eclair
* changes:
  Fix transformation on windows.
2009-09-18 20:56:25 -04:00
jsh
ea62f32e9e am 27272bfa: Merge change 25839 into eclair
Merge commit '27272bfac63fab28aa3899243dfe79f226445b3b' into eclair-plus-aosp

* commit '27272bfac63fab28aa3899243dfe79f226445b3b':
  Fix potential ArrayIndexOutOfBoundsException.
2009-09-18 17:15:06 -07:00
Android (Google) Code Review
e1b107c895 Merge change 25839 into eclair
* changes:
  Fix potential ArrayIndexOutOfBoundsException.
2009-09-18 20:09:34 -04:00
Yu Shan Emily Lau
a5bdcce4ba am e785d180: Merge change 25826 into eclair
Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp

* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 16:23:06 -07:00
Android (Google) Code Review
4ca874e3e6 Merge change 25826 into eclair
* changes:
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 19:14:32 -04:00
Evan Millar
c1c428e9e6 am 95ebd3bd: Merge change 25847 into eclair
Merge commit '95ebd3bdd08e6ad8e13f2ca094a009fabe25ea81' into eclair-plus-aosp

* commit '95ebd3bdd08e6ad8e13f2ca094a009fabe25ea81':
  Fix http://b/issue?id=2099487
2009-09-18 16:05:27 -07:00
Dmitri Plotnikov
5a8b8fea7d am de71cb3b: ContactsContract: Adding joined columns to the Data class definition.
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp

* commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59':
  ContactsContract: Adding joined columns to the Data class definition.
2009-09-18 16:05:18 -07:00
Android (Google) Code Review
a791e507ea Merge change 25847 into eclair
* changes:
  Fix http://b/issue?id=2099487
2009-09-18 18:59:58 -04:00
Dan Egnor
880f7d19db am 90d8a6a4: Merge change 25628 into eclair
Merge commit '90d8a6a449dc12fea2b56b557c243e33746d914a' into eclair-plus-aosp

* commit '90d8a6a449dc12fea2b56b557c243e33746d914a':
  Inefficient but correct fix for 2122381: call finishBackup after every performBackup
2009-09-18 15:33:57 -07:00