Commit Graph

5127 Commits

Author SHA1 Message Date
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
Android (Google) Code Review
920afe8191 Merge change 25628 into eclair
* changes:
  Inefficient but correct fix for 2122381: call finishBackup after every performBackup
2009-09-18 18:25:33 -04:00
Dmitri Plotnikov
c6f99af7a6 am b18b0956: Merge change 25829 into eclair
Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp

* commit 'b18b0956afbe0730ced1c5b95c0071dba447765e':
  Revert "ContactsContract: Adding joined columns to the Data class definition."
2009-09-18 15:13:59 -07:00
Android (Google) Code Review
d1311cdf31 Merge change 25829 into eclair
* changes:
  Revert "ContactsContract: Adding joined columns to the Data class definition."
2009-09-18 18:05:50 -04:00
Jason Sams
672b18c3a1 am a411bf01: Merge change 25818 into eclair
Merge commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2' into eclair-plus-aosp

* commit 'a411bf01fc8c581651af19556cc9e4bf7aca8da2':
  Clean up some debugging and add 2 math lib routines.
2009-09-18 14:33:17 -07:00
Android (Google) Code Review
cc9deeb031 Merge change 25818 into eclair
* changes:
  Clean up some debugging and add 2 math lib routines.
2009-09-18 17:25:21 -04:00
Libin Tang
a2739a9c34 am 6286f311: Merge change 25810 into eclair
Merge commit '6286f311c3b80ee6b4b1985a290a889f895203f9' into eclair-plus-aosp

* commit '6286f311c3b80ee6b4b1985a290a889f895203f9':
  Fix pause-wait dial string conversion error
2009-09-18 14:08:12 -07:00
Android (Google) Code Review
658ba87e29 Merge change 25810 into eclair
* changes:
  Fix pause-wait dial string conversion error
2009-09-18 17:02:56 -04:00
Dmitri Plotnikov
e7a6e318f8 am 6a154178: Merge change 25800 into eclair
Merge commit '6a15417849afab889f1f0cd79e655eaac6b45dca' into eclair-plus-aosp

* commit '6a15417849afab889f1f0cd79e655eaac6b45dca':
  ContactsContract: Adding joined columns to the Data class definition.
2009-09-18 14:00:03 -07:00
Nick Pelly
896b3ee6f8 am d7638e6d: Merge change 25780 into eclair
Merge commit 'd7638e6de29d475623ac7f05a6fa92e92362be22' into eclair-plus-aosp

* commit 'd7638e6de29d475623ac7f05a6fa92e92362be22':
  Reject lowercase characters in checkBluetoothAddress().
2009-09-18 13:59:55 -07:00
Evan Millar
8e572c6c9c am 2c22a510: More hi-res assets, and darken background color to donut level.
Merge commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3' into eclair-plus-aosp

* commit '2c22a51072fd71e3a50df9c26f9078bd62c90cd3':
  More hi-res assets, and darken background color to donut level.
2009-09-18 13:59:46 -07:00
Daniel Sandler
bdda3f1db1 am e5a6d16f: Merge change 25785 into eclair
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp

* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
2009-09-18 13:59:38 -07:00
Android (Google) Code Review
57bee39221 Merge change 25800 into eclair
* changes:
  ContactsContract: Adding joined columns to the Data class definition.
2009-09-18 16:54:34 -04:00
Android (Google) Code Review
d1378a12f6 Merge change 25780 into eclair
* changes:
  Reject lowercase characters in checkBluetoothAddress().
2009-09-18 16:51:36 -04:00
Android (Google) Code Review
13026403db Merge change 25785 into eclair
* changes:
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
2009-09-18 15:23:40 -04:00
Daniel Sandler
f590322bf5 am 3f90aae6: Merge change 25786 into eclair
Merge commit '3f90aae6184bf0713ad684fcea3c4836479b9de4' into eclair-plus-aosp

* commit '3f90aae6184bf0713ad684fcea3c4836479b9de4':
  Fix http://b/2086471 (list view headers too dark in mdpi).
2009-09-18 12:23:39 -07:00
Android (Google) Code Review
fe9acfe42d Merge change 25786 into eclair
* changes:
  Fix http://b/2086471 (list view headers too dark in mdpi).
2009-09-18 15:18:27 -04:00
Jacek Surazski
1f1652565b am c3a3b399: Merge change 25752 into eclair
Merge commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22' into eclair-plus-aosp

* commit 'c3a3b399a9d7707b7f3c4108e0e31a1b664a6f22':
  Add a Gservices setting to controll the app error reporting feature.
2009-09-18 12:13:35 -07:00
Android (Google) Code Review
e40f007042 Merge change 25752 into eclair
* changes:
  Add a Gservices setting to controll the app error reporting feature.
2009-09-18 15:07:28 -04:00
Robert Greenwalt
755a4ac471 am 66fdd84e: Merge change 25775 into eclair
Merge commit '66fdd84e28a0619b7981ca00f2f2cd7681dbc82d' into eclair-plus-aosp

* commit '66fdd84e28a0619b7981ca00f2f2cd7681dbc82d':
  Fix typo in SECONDARY_DATA_RETRY_CONFIG
2009-09-18 12:02:59 -07:00
Chih-Chung Chang
5b9dc1a2af am f22b7410: Merge change 25464 into eclair
Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
  Improve ExifInterface API.
2009-09-18 12:02:50 -07:00
Android (Google) Code Review
10d63060b2 Merge change 25775 into eclair
* changes:
  Fix typo in SECONDARY_DATA_RETRY_CONFIG
2009-09-18 14:53:46 -04:00
Android (Google) Code Review
18a2cc4ca0 Merge change 25464 into eclair
* changes:
  Improve ExifInterface API.
2009-09-18 14:38:38 -04:00
Andrei Popescu
485f28ccf8 am fd49faae: Merge change 25772 into eclair
Merge commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d' into eclair-plus-aosp

* commit 'fd49faae33dc813c93347d1bcc8fa7c4fa0ae55d':
  Add progress view and default poster for the <video> implementation
2009-09-18 11:28:48 -07:00
Nick Pelly
cf0d2c3c7e am 93727454: Merge change 25768 into eclair
Merge commit '93727454caf1b3540a352328abd0400c2242902b' into eclair-plus-aosp

* commit '93727454caf1b3540a352328abd0400c2242902b':
  Add one line of logging when SCO SOCKET connect starts.
2009-09-18 11:28:41 -07:00
Android (Google) Code Review
97e1023344 Merge change 25772 into eclair
* changes:
  Add progress view and default poster for the <video> implementation
2009-09-18 14:22:01 -04:00
Android (Google) Code Review
06657708ac Merge change 25768 into eclair
* changes:
  Add one line of logging when SCO SOCKET connect starts.
2009-09-18 13:29:34 -04:00
Dianne Hackborn
00621b2440 am ffda371c: Merge change 25734 into eclair
Merge commit 'ffda371c220de9c97663fef4e9d14bee7267383d' into eclair-plus-aosp

* commit 'ffda371c220de9c97663fef4e9d14bee7267383d':
  Show the live wallpaper on the lock screen.
2009-09-18 10:25:46 -07:00
Android (Google) Code Review
70f6243ea2 Merge change 25734 into eclair
* changes:
  Show the live wallpaper on the lock screen.
2009-09-18 13:16:30 -04:00