OSDN Git Service
Vasu Nori [Fri, 4 Dec 2009 00:31:03 +0000 (16:31 -0800)]
am
6d1ec0d8: dealloc compiled-sql statements before deref\'ing them from SQLiteDatabase obj.
Merge commit '
6d1ec0d81cd8ecdd390b31e724bac554bb955a94' into eclair-mr2-plus-aosp
* commit '
6d1ec0d81cd8ecdd390b31e724bac554bb955a94':
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
Daniel Sandler [Fri, 4 Dec 2009 00:30:21 +0000 (16:30 -0800)]
am
add86719: am
14bee131: Fix lock screen layouts with emergency call buttons.
Merge commit '
add867197c0ae81b8120d70e4ae936df4a9c29bb' into eclair-mr2-plus-aosp
* commit '
add867197c0ae81b8120d70e4ae936df4a9c29bb':
Fix lock screen layouts with emergency call buttons.
Vasu Nori [Wed, 2 Dec 2009 21:21:12 +0000 (13:21 -0800)]
dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj.
dealloc compiled-sql statements before removing references of SQLiteClosable objects from SQLiteDatabase obj. otherwise, code will attempt to close database before deallocing the compiled-sql statements and that causes sqlite exceptions.
Daniel Sandler [Thu, 3 Dec 2009 16:42:34 +0000 (08:42 -0800)]
am
14bee131: Fix lock screen layouts with emergency call buttons.
Merge commit '
14bee131da68404b33655a241de83c2eeb417559' into eclair-mr2
* commit '
14bee131da68404b33655a241de83c2eeb417559':
Fix lock screen layouts with emergency call buttons.
Daniel Sandler [Wed, 2 Dec 2009 21:15:37 +0000 (16:15 -0500)]
Fix lock screen layouts with emergency call buttons.
Fixes http://b/
2259529
Partially fixes http://b/
2260798
Change-Id: Iabb3f74dc2a331810ae8ff44ebb319fe25d217ef
Wu-cheng Li [Thu, 3 Dec 2009 08:22:43 +0000 (00:22 -0800)]
am
64fc8082: am
40057ce7: Document that stopPreview is not needed before takePicture.
Merge commit '
64fc80823e1e954a419bdcb0a193e4c56a8da959' into eclair-mr2-plus-aosp
* commit '
64fc80823e1e954a419bdcb0a193e4c56a8da959':
Document that stopPreview is not needed before takePicture.
Wu-cheng Li [Thu, 3 Dec 2009 08:16:35 +0000 (00:16 -0800)]
am
40057ce7: Document that stopPreview is not needed before takePicture.
Merge commit '
40057ce749c8c4d274db0352a2af4344bda92dba' into eclair-mr2
* commit '
40057ce749c8c4d274db0352a2af4344bda92dba':
Document that stopPreview is not needed before takePicture.
Wu-cheng Li [Wed, 2 Dec 2009 10:57:29 +0000 (18:57 +0800)]
Document that stopPreview is not needed before takePicture.
Also, applications can call startPreview after jpeg callback is received.
http://b/
2292461
Joe Onorato [Thu, 3 Dec 2009 07:39:16 +0000 (23:39 -0800)]
am
a8974b63: am
19a4157c: Make the notification panel send the position as well.
Merge commit '
a8974b637c384d10bac10d94fae7487afdb2c16d' into eclair-mr2-plus-aosp
* commit '
a8974b637c384d10bac10d94fae7487afdb2c16d':
Make the notification panel send the position as well.
Joe Onorato [Thu, 3 Dec 2009 07:33:56 +0000 (23:33 -0800)]
am
19a4157c: Make the notification panel send the position as well.
Merge commit '
19a4157ce40f4ab77b60445b8e73069c5877bb8a' into eclair-mr2
* commit '
19a4157ce40f4ab77b60445b8e73069c5877bb8a':
Make the notification panel send the position as well.
Joe Onorato [Thu, 3 Dec 2009 07:26:27 +0000 (23:26 -0800)]
Make the notification panel send the position as well.
Joe Onorato [Thu, 3 Dec 2009 07:22:52 +0000 (23:22 -0800)]
am
6c5401d8: am
7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit '
6c5401d8b780d324afb784d4c0fba69cee4a6a9a' into eclair-mr2-plus-aosp
* commit '
6c5401d8b780d324afb784d4c0fba69cee4a6a9a':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Joe Onorato [Thu, 3 Dec 2009 07:22:19 +0000 (23:22 -0800)]
am
b28632a5: am
c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.
Merge commit '
b28632a5206d11844db39ca1ab5f64a99ec74e29' into eclair-mr2-plus-aosp
* commit '
b28632a5206d11844db39ca1ab5f64a99ec74e29':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Joe Onorato [Thu, 3 Dec 2009 07:16:11 +0000 (23:16 -0800)]
am
7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit '
7597065d6b0877ffc460b443fdb1595965ccd7b2' into eclair-mr2
* commit '
7597065d6b0877ffc460b443fdb1595965ccd7b2':
Make RemoteViews also set the sourceBounds in the PendingIntent.
Joe Onorato [Thu, 3 Dec 2009 07:04:55 +0000 (23:04 -0800)]
Make RemoteViews also set the sourceBounds in the PendingIntent.
Joe Onorato [Thu, 3 Dec 2009 06:40:57 +0000 (22:40 -0800)]
am
c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.
Merge commit '
c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2
* commit '
c7a63eea8d3d346addaaf892b5bbe0aa80651640':
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Joe Onorato [Thu, 3 Dec 2009 05:13:17 +0000 (21:13 -0800)]
Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
be sent.
Dmitri Plotnikov [Thu, 3 Dec 2009 06:08:38 +0000 (22:08 -0800)]
am
780211a9: Fixing broken build
Merge commit '
780211a9a792dcc4cd57df0a4e8da34d05eb99f1' into eclair-mr2-plus-aosp
* commit '
780211a9a792dcc4cd57df0a4e8da34d05eb99f1':
Fixing broken build
Dmitri Plotnikov [Thu, 3 Dec 2009 06:00:32 +0000 (22:00 -0800)]
Fixing broken build
Change-Id: Iead6eb44261c2415731bc8cfec53fc48c4c13fa8
Li Wenhao [Thu, 3 Dec 2009 05:24:48 +0000 (21:24 -0800)]
am
2b3509c9: Merge change I51438c18 into eclair-mr2
Merge commit '
2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df' into eclair-mr2-plus-aosp
* commit '
2b3509c9a5d6f3a7142430cd0b81d135a9c0a5df':
the vertex index should be "first + i".
Android (Google) Code Review [Thu, 3 Dec 2009 05:17:57 +0000 (21:17 -0800)]
Merge change I51438c18 into eclair-mr2
* changes:
the vertex index should be "first + i".
Jack Veenstra [Thu, 3 Dec 2009 05:15:51 +0000 (21:15 -0800)]
am
1b04daf9: am
de534329: Merge change Ica5efffe into eclair
Merge commit '
1b04daf92b2f76da532c35e92eaa9ed2a9663d36' into eclair-mr2-plus-aosp
* commit '
1b04daf92b2f76da532c35e92eaa9ed2a9663d36':
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Li Wenhao [Wed, 29 Jul 2009 06:45:08 +0000 (14:45 +0800)]
the vertex index should be "first + i".
Jack Veenstra [Thu, 3 Dec 2009 05:09:10 +0000 (21:09 -0800)]
am
de534329: Merge change Ica5efffe into eclair
Merge commit '
de5343290c4bac9b10b6fdd328b70da6f5e4d626' into eclair-mr2
* commit '
de5343290c4bac9b10b6fdd328b70da6f5e4d626':
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Android (Google) Code Review [Thu, 3 Dec 2009 05:01:20 +0000 (21:01 -0800)]
Merge change Ica5efffe into eclair
* changes:
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Jack Veenstra [Thu, 3 Dec 2009 04:14:50 +0000 (20:14 -0800)]
Fix bug
2216426: correct the hdpi star assets for RatingBar.
Dianne Hackborn [Thu, 3 Dec 2009 03:01:31 +0000 (19:01 -0800)]
am
a45e9251: am
dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit '
a45e925108f6c9d35d9e7b5e8def9aba49ee0dba' into eclair-mr2-plus-aosp
* commit '
a45e925108f6c9d35d9e7b5e8def9aba49ee0dba':
Fix issue #
2300232: Bugs in resolving conflicting pointers
Dianne Hackborn [Thu, 3 Dec 2009 02:56:20 +0000 (18:56 -0800)]
am
dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit '
dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2
* commit '
dcd58cfda366c915b1f0739cb115f9d972351c73':
Fix issue #
2300232: Bugs in resolving conflicting pointers
Android (Google) Code Review [Thu, 3 Dec 2009 02:51:19 +0000 (18:51 -0800)]
Merge change I7b9328c7 into eclair
* changes:
Fix issue #
2300232: Bugs in resolving conflicting pointers
Dianne Hackborn [Thu, 3 Dec 2009 02:42:39 +0000 (18:42 -0800)]
Fix issue #
2300232: Bugs in resolving conflicting pointers
Change-Id: I7b9328c7a1c4f6b731e64cdca2ed9de71b84587f
Omari Stephens [Thu, 3 Dec 2009 02:32:51 +0000 (18:32 -0800)]
am
21eb1738: am
7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '
21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp
* commit '
21eb173864670c2f759258016d95f0bcd06313e7':
Revive backup tests
Omari Stephens [Thu, 3 Dec 2009 02:26:05 +0000 (18:26 -0800)]
am
7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '
7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2
* commit '
7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
Revive backup tests
Android (Google) Code Review [Thu, 3 Dec 2009 02:21:49 +0000 (18:21 -0800)]
Merge change Iaa6e73a6 into eclair
* changes:
Revive backup tests
Guang Zhu [Thu, 3 Dec 2009 02:11:34 +0000 (18:11 -0800)]
am
7dd3337b: Merge change I8179742a into eclair-mr2
Merge commit '
7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab' into eclair-mr2-plus-aosp
* commit '
7dd3337b8e3ef27fd64df9afdbd0f658de77f3ab':
Add support for extracting render time and image in page cycler
Takaoka G. Tadashi [Thu, 3 Dec 2009 02:11:04 +0000 (18:11 -0800)]
am
d5b325aa: Add WSP header to WAP_PUSH_RECEIVED intent in addition to data Import CL 146651 from //branches/cupcake_dcm
Merge commit '
d5b325aaaca7e5197851d26332f48b917d961b9d' into eclair-mr2-plus-aosp
* commit '
d5b325aaaca7e5197851d26332f48b917d961b9d':
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Takaoka G. Tadashi [Thu, 3 Dec 2009 02:10:34 +0000 (18:10 -0800)]
am
7d51517c: Merge change I611c15cf into eclair-mr2
Merge commit '
7d51517cec75cbccd1ac53ac6ca7dd506af4637e' into eclair-mr2-plus-aosp
* commit '
7d51517cec75cbccd1ac53ac6ca7dd506af4637e':
Add DoCoMo vendor specific OMNA WSP content type number
Dmitri Plotnikov [Thu, 3 Dec 2009 02:09:59 +0000 (18:09 -0800)]
am
bbdba641: Merge change Icae1a990 into eclair-mr2
Merge commit '
bbdba6414ff4adccad2a56195c8c144f7e3a025a' into eclair-mr2-plus-aosp
* commit '
bbdba6414ff4adccad2a56195c8c144f7e3a025a':
Adding NAME_RAW_CONTACT_ID column to Contacts.
Mathias Agopian [Thu, 3 Dec 2009 02:09:22 +0000 (18:09 -0800)]
am
96dac84b: am
121a31ac: Merge change Id86beb99 into eclair
Merge commit '
96dac84be4143d83b13648045b9af31ac0f81004' into eclair-mr2-plus-aosp
* commit '
96dac84be4143d83b13648045b9af31ac0f81004':
fix [
2291418] Camera preview cannot work in Emulator
Android (Google) Code Review [Thu, 3 Dec 2009 02:04:23 +0000 (18:04 -0800)]
Merge change I8179742a into eclair-mr2
* changes:
Add support for extracting render time and image in page cycler
Takaoka G. Tadashi [Wed, 4 Nov 2009 05:36:21 +0000 (14:36 +0900)]
Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Import CL 146651 from //branches/cupcake_dcm
Android (Google) Code Review [Thu, 3 Dec 2009 01:56:20 +0000 (17:56 -0800)]
Merge change I611c15cf into eclair-mr2
* changes:
Add DoCoMo vendor specific OMNA WSP content type number Import CL 145261 from //branches/cupcake_dcm
Android (Google) Code Review [Thu, 3 Dec 2009 01:55:39 +0000 (17:55 -0800)]
Merge change Icae1a990 into eclair-mr2
* changes:
Adding NAME_RAW_CONTACT_ID column to Contacts.
Guang Zhu [Fri, 30 Oct 2009 01:24:54 +0000 (18:24 -0700)]
Add support for extracting render time and image in page cycler
Mike Lockwood [Thu, 3 Dec 2009 01:51:09 +0000 (17:51 -0800)]
am
f72fb68b: resolved conflicts for merge of
9b7dba93 to eclair-mr2
Merge commit '
f72fb68bf32014b075fe577c8495c2c8a86476a9' into eclair-mr2-plus-aosp
* commit '
f72fb68bf32014b075fe577c8495c2c8a86476a9':
Implement new notification LED blinking logic:
Mathias Agopian [Thu, 3 Dec 2009 01:50:45 +0000 (17:50 -0800)]
am
121a31ac: Merge change Id86beb99 into eclair
Merge commit '
121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2
* commit '
121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
fix [
2291418] Camera preview cannot work in Emulator
Omari Stephens [Thu, 3 Dec 2009 01:39:27 +0000 (17:39 -0800)]
Revive backup tests
Android (Google) Code Review [Thu, 3 Dec 2009 01:09:46 +0000 (17:09 -0800)]
Merge change Id86beb99 into eclair
* changes:
fix [
2291418] Camera preview cannot work in Emulator
Mike Lockwood [Thu, 3 Dec 2009 00:57:33 +0000 (19:57 -0500)]
resolved conflicts for merge of
9b7dba93 to eclair-mr2
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
Dianne Hackborn [Thu, 3 Dec 2009 00:29:54 +0000 (16:29 -0800)]
am
2d8b0c3f: am
8693f82d: Merge change If1f0bf33 into eclair
Merge commit '
2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0' into eclair-mr2-plus-aosp
* commit '
2d8b0c3f0fbc3c42063f4e790ca85b86c5d655f0':
Some work on issue #
2286804: sometimes text field doesn't accept input
Android (Google) Code Review [Thu, 3 Dec 2009 00:24:15 +0000 (16:24 -0800)]
Merge change Icc49422a into eclair
* changes:
Implement new notification LED blinking logic:
Dianne Hackborn [Thu, 3 Dec 2009 00:23:45 +0000 (16:23 -0800)]
am
8693f82d: Merge change If1f0bf33 into eclair
Merge commit '
8693f82d02fd9b3a805e076fa1eafacd1737446d' into eclair-mr2
* commit '
8693f82d02fd9b3a805e076fa1eafacd1737446d':
Some work on issue #
2286804: sometimes text field doesn't accept input
Mathias Agopian [Thu, 3 Dec 2009 00:23:11 +0000 (16:23 -0800)]
fix [
2291418] Camera preview cannot work in Emulator
The image buffer used by glTexImage2d() would be uninitialized when no copybit engine
can be found.
We now always initialize images, since the abscence of copybit is not necessarily fatal.
Android (Google) Code Review [Thu, 3 Dec 2009 00:17:54 +0000 (16:17 -0800)]
Merge change If1f0bf33 into eclair
* changes:
Some work on issue #
2286804: sometimes text field doesn't accept input
Jaikumar Ganesh [Thu, 3 Dec 2009 00:17:15 +0000 (16:17 -0800)]
am
f45bf8fa: am
59c06278: (-s ours) Merge change I721361f1 into eclair
Merge commit '
f45bf8fa4056fc800cc181b7031bd886e97aa1d5' into eclair-mr2-plus-aosp
* commit '
f45bf8fa4056fc800cc181b7031bd886e97aa1d5':
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Scott Main [Thu, 3 Dec 2009 00:16:45 +0000 (16:16 -0800)]
am
7863eb11: am
525bfe89: Merge change I9fb53a9c into eclair
Merge commit '
7863eb11265cd06ee35a670b5e994d65e31337c3' into eclair-mr2-plus-aosp
* commit '
7863eb11265cd06ee35a670b5e994d65e31337c3':
add screenshots for the Bluetooth Chat sample app
Wink Saville [Thu, 3 Dec 2009 00:16:17 +0000 (16:16 -0800)]
am
2f9d8dbe: Merge change I749d6801 into eclair-mr2
Merge commit '
2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979' into eclair-mr2-plus-aosp
* commit '
2f9d8dbe9f5310bc39bf2e31c0fbc396ed6dd979':
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
Jaikumar Ganesh [Thu, 3 Dec 2009 00:10:04 +0000 (16:10 -0800)]
am
59c06278: (-s ours) Merge change I721361f1 into eclair
Merge commit '
59c0627841381f47da5cc72e6ff55fa8bad431ed' into eclair-mr2
* commit '
59c0627841381f47da5cc72e6ff55fa8bad431ed':
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Android (Google) Code Review [Thu, 3 Dec 2009 00:02:58 +0000 (16:02 -0800)]
Merge change I721361f1 into eclair
* changes:
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
Scott Main [Wed, 2 Dec 2009 23:49:56 +0000 (15:49 -0800)]
am
525bfe89: Merge change I9fb53a9c into eclair
Merge commit '
525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-mr2
* commit '
525bfe896b8638d20e6d7a362fd089ef8e316d4a':
add screenshots for the Bluetooth Chat sample app
Android (Google) Code Review [Wed, 2 Dec 2009 23:40:17 +0000 (15:40 -0800)]
Merge change I9fb53a9c into eclair
* changes:
add screenshots for the Bluetooth Chat sample app
Jaikumar Ganesh [Fri, 20 Nov 2009 23:21:47 +0000 (15:21 -0800)]
Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
1. PRIORITY_OFF is when user unchecks A2DP connection profile box.
2. By default, when you bond, it will be PRIORITY_ON.
3. When the profile gets connected, the priority gets set to
PRIORITY_AUTO_CONNECT. This means that we will connect
automatically to this profile.
4. When the user disconnects, we downgrade the priority to PRIORITY_ON,
which means we won't reconnect automatically.
a) We need to make a similar change to Handsfree profile.
b) We need to rework the profile management design and code which
will fix the 6 second timer that we have for A2DP reconnection.
Add AUTO_CONNECT priority for Headset profile.
Also, don't set priority to ON while disconnecting.
This logic has been pushed up to the Settings app.
Dr No: Eastham
Bug:
2133530
Dianne Hackborn [Wed, 2 Dec 2009 21:47:25 +0000 (13:47 -0800)]
Some work on issue #
2286804: sometimes text field doesn't accept input
This doesn't really fix the problem being brought up here, but fixes a
related issue I found while investigating it -- if you tap a text view
enough to cause it to try to scroll, this will cause the touch to become
a scroll instead of a click, even if there is nothing to scroll. So
often quick taps to bring up the IME would be canceled because they
became a non-scroll.
Unfortuntately after syncing the latest build, I was having a lot of
trouble reproducing the original problem. I think I need to punt it to
MR2 at this point.
Change-Id: If1f0bf33de1b4d71c9f677cdad07639b7a3fb772
Eric Fischer [Wed, 2 Dec 2009 23:20:54 +0000 (15:20 -0800)]
am
fbc18f9b: am
6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit '
fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da' into eclair-mr2-plus-aosp
* commit '
fbc18f9b203c3bf808f454cb53cfc6d6bf49a8da':
Import revised translations. DO NOT MERGE
Android (Google) Code Review [Wed, 2 Dec 2009 23:16:58 +0000 (15:16 -0800)]
Merge change I749d6801 into eclair-mr2
* changes:
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set and minor fixes.
Eric Fischer [Wed, 2 Dec 2009 23:11:36 +0000 (15:11 -0800)]
am
6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit '
6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2
* commit '
6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
Import revised translations. DO NOT MERGE
Scott Main [Wed, 2 Dec 2009 23:08:19 +0000 (15:08 -0800)]
add screenshots for the Bluetooth Chat sample app
Wink Saville [Wed, 2 Dec 2009 23:07:34 +0000 (15:07 -0800)]
Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set
and minor fixes.
Fix the following
- When PROPERTY_OPERATOR_NUMERIC is not set, the value is "" when CDMAPhone
is initialized. The constructor tries to extract MCC and MNC from this
property and results in a StringIndexOutOfBounds exception. Check for empty
OperatorNumeric string before trying to extract MCC and MNC
- Handle RIL_REQUEST_REPORT_STK_SERVICE_IS_RUNNING response gracefully.
Change-Id: I749d6801bb4794d56e8fd672dec69dfea2b5c756
Android (Google) Code Review [Wed, 2 Dec 2009 23:01:35 +0000 (15:01 -0800)]
Merge change Id0704505 into eclair
* changes:
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 2 Dec 2009 22:53:54 +0000 (14:53 -0800)]
Import revised translations. DO NOT MERGE
Ken Shirriff [Wed, 2 Dec 2009 21:10:13 +0000 (13:10 -0800)]
am
dfac0e5e: Merge change I3fbd0a2f into eclair-mr2
Merge commit '
dfac0e5ece844c9052d54bfde6b2cc013a818beb' into eclair-mr2-plus-aosp
* commit '
dfac0e5ece844c9052d54bfde6b2cc013a818beb':
Generate a calendar static Java library.
Android (Google) Code Review [Wed, 2 Dec 2009 21:02:36 +0000 (13:02 -0800)]
Merge change I3fbd0a2f into eclair-mr2
* changes:
Generate a calendar static Java library.
Leon Scroggins [Wed, 2 Dec 2009 20:46:32 +0000 (12:46 -0800)]
am
b5c7ef33: When passing the Message for saved form data, pass the node pointer properly.
Merge commit '
b5c7ef331cfca927c5b67bfe472eb7173a0ca69f' into eclair-mr2-plus-aosp
* commit '
b5c7ef331cfca927c5b67bfe472eb7173a0ca69f':
When passing the Message for saved form data, pass the node pointer properly.
Leon Scroggins [Wed, 2 Dec 2009 19:50:41 +0000 (14:50 -0500)]
When passing the Message for saved form data, pass the node pointer properly.
Partial fix for http://b/issue?id=
2232001
We were calling obtainMessage with the node pointer as an argument. What we
really need to do is set arg1 to the node pointer. Also, avoid checking for
saved form data for password fields and fields whose names are blank.
Grace Kloba [Wed, 2 Dec 2009 19:48:46 +0000 (11:48 -0800)]
am
4eeace3d: Merge change I097b1e77 into eclair-mr2
Merge commit '
4eeace3db541bd6fa0034a996630768cb521f2eb' into eclair-mr2-plus-aosp
* commit '
4eeace3db541bd6fa0034a996630768cb521f2eb':
Add PageCacheCapacity to the WebSettings.
Android (Google) Code Review [Wed, 2 Dec 2009 19:43:56 +0000 (11:43 -0800)]
Merge change I097b1e77 into eclair-mr2
* changes:
Add PageCacheCapacity to the WebSettings.
Fred Quintana [Wed, 2 Dec 2009 19:38:29 +0000 (11:38 -0800)]
am
f307ec5d: Merge change Iafa92b8f into eclair-mr2
Merge commit '
f307ec5d82ce75112eb60118db89dbfee6819e90' into eclair-mr2-plus-aosp
* commit '
f307ec5d82ce75112eb60118db89dbfee6819e90':
remove accounts for authenticators that are uninstalled
Mark Wagner [Wed, 2 Dec 2009 19:37:55 +0000 (11:37 -0800)]
am
ba1a0717: Merge change I6430912f into eclair-mr2
Merge commit '
ba1a0717946c3d49347e663dda73aa3f91e3d642' into eclair-mr2-plus-aosp
* commit '
ba1a0717946c3d49347e663dda73aa3f91e3d642':
New constants for db upgrade.
Wink Saville [Wed, 2 Dec 2009 19:34:26 +0000 (11:34 -0800)]
am
7d2fd650: am
cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit '
7d2fd6501595137e91ad042cd550decd2f8040fc' into eclair-mr2-plus-aosp
* commit '
7d2fd6501595137e91ad042cd550decd2f8040fc':
Cleanup @hide and @deprecated directives.
Android (Google) Code Review [Wed, 2 Dec 2009 19:31:35 +0000 (11:31 -0800)]
Merge change Iafa92b8f into eclair-mr2
* changes:
remove accounts for authenticators that are uninstalled
Android (Google) Code Review [Wed, 2 Dec 2009 19:30:34 +0000 (11:30 -0800)]
Merge change I6430912f into eclair-mr2
* changes:
New constants for db upgrade.
Mike Lockwood [Wed, 2 Dec 2009 16:15:02 +0000 (11:15 -0500)]
Implement new notification LED blinking logic:
1) Do not pulse notification LED when screen is on.
2) Pulse once on new notification if Settings.System.NOTIFICATION_LIGHT_PULSE is false,
otherwise pulse persistently while screen is off.
Fixes part of bug b/
2238250 (trackball should pulse occasionally to indicate new email)
Change-Id: Icc49422a4e9d14412fc159a8e2596503a85bac51
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fred Quintana [Wed, 2 Dec 2009 00:27:03 +0000 (16:27 -0800)]
remove accounts for authenticators that are uninstalled
Wink Saville [Wed, 2 Dec 2009 19:26:23 +0000 (11:26 -0800)]
am
cc6ff2bc: Cleanup @hide and @deprecated directives.
Merge commit '
cc6ff2bc6011294367d9a8c644f811449e952eb7' into eclair-mr2
* commit '
cc6ff2bc6011294367d9a8c644f811449e952eb7':
Cleanup @hide and @deprecated directives.
Wink Saville [Wed, 2 Dec 2009 17:46:38 +0000 (09:46 -0800)]
Cleanup @hide and @deprecated directives.
Bug:
2294396
Change-Id: Icb34706a203fb34e52c67b904328e91a7803d4fc
Amith Yamasani [Wed, 2 Dec 2009 17:57:47 +0000 (09:57 -0800)]
am
42c4c589: am
a9791d30: Merge change Iae3ed706 into eclair
Merge commit '
42c4c589003c029309c823e8f06ed00b3cdb21de' into eclair-mr2-plus-aosp
* commit '
42c4c589003c029309c823e8f06ed00b3cdb21de':
Add new setting for notification light pulsing. Bug #
2238250
Dirk Dougherty [Wed, 2 Dec 2009 17:57:17 +0000 (09:57 -0800)]
am
233c50e4: am
43810507: Merge change Ic8231560 into eclair
Merge commit '
233c50e4aa6de6f77b90c5c65f956f9f4251b5a9' into eclair-mr2-plus-aosp
* commit '
233c50e4aa6de6f77b90c5c65f956f9f4251b5a9':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Eric Laurent [Wed, 2 Dec 2009 17:56:44 +0000 (09:56 -0800)]
am
6076046a: am
1ac56b60: Merge change Iac196e17 into eclair
Merge commit '
6076046a11d2cd3733e4c7d108b3b26d167ae731' into eclair-mr2-plus-aosp
* commit '
6076046a11d2cd3733e4c7d108b3b26d167ae731':
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Mathias Agopian [Wed, 2 Dec 2009 17:56:08 +0000 (09:56 -0800)]
am
f764dae4: am
33ad0f9e: Merge change I0e44976a into eclair
Merge commit '
f764dae4a5f662660bea0657746622b6672b24a9' into eclair-mr2-plus-aosp
* commit '
f764dae4a5f662660bea0657746622b6672b24a9':
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Amith Yamasani [Wed, 2 Dec 2009 17:50:40 +0000 (09:50 -0800)]
am
a9791d30: Merge change Iae3ed706 into eclair
Merge commit '
a9791d304b8ec03e04ad4533b1820a64794e1bcc' into eclair-mr2
* commit '
a9791d304b8ec03e04ad4533b1820a64794e1bcc':
Add new setting for notification light pulsing. Bug #
2238250
Dirk Dougherty [Wed, 2 Dec 2009 17:49:21 +0000 (09:49 -0800)]
am
43810507: Merge change Ic8231560 into eclair
Merge commit '
43810507b75cd492e8177ee082e688f87f0ab49c' into eclair-mr2
* commit '
43810507b75cd492e8177ee082e688f87f0ab49c':
sdk doc change for esr: update download zip filenames, add maxSdkVersion warning, misc other changes.
Eric Laurent [Wed, 2 Dec 2009 17:48:52 +0000 (09:48 -0800)]
am
1ac56b60: Merge change Iac196e17 into eclair
Merge commit '
1ac56b602aa6a1ac54c608e5a8b76f44638db23b' into eclair-mr2
* commit '
1ac56b602aa6a1ac54c608e5a8b76f44638db23b':
Fix issue
2292062: Audio freezes for three seconds when choosing ringtones with a headset connected and music playing.
Mathias Agopian [Wed, 2 Dec 2009 17:47:48 +0000 (09:47 -0800)]
am
33ad0f9e: Merge change I0e44976a into eclair
Merge commit '
33ad0f9ec8d47660b16ced45242a45f369fe2547' into eclair-mr2
* commit '
33ad0f9ec8d47660b16ced45242a45f369fe2547':
fix [
2297155] SurfaceFlinger's freeze-timeout doesn't work
Android (Google) Code Review [Wed, 2 Dec 2009 16:35:55 +0000 (08:35 -0800)]
Merge change Iae3ed706 into eclair
* changes:
Add new setting for notification light pulsing. Bug #
2238250
Leon Scroggins [Wed, 2 Dec 2009 15:42:26 +0000 (07:42 -0800)]
am
cfc2915d: In setDefaultSelection ensure that webkit is notified of the new selection.
Merge commit '
cfc2915d926cee14380b54d0960262e748eed4f5' into eclair-mr2-plus-aosp
* commit '
cfc2915d926cee14380b54d0960262e748eed4f5':
In setDefaultSelection ensure that webkit is notified of the new selection.
Leon Scroggins [Wed, 2 Dec 2009 15:12:57 +0000 (10:12 -0500)]
In setDefaultSelection ensure that webkit is notified of the new selection.
Fix for http://b/issue?id=
2254732
Dianne Hackborn [Wed, 2 Dec 2009 13:35:46 +0000 (05:35 -0800)]
am
9ed7dc10: am
5886050f: Merge change I0d8f7593 into eclair
Merge commit '
9ed7dc10d263a505da32522139098f085fee811a' into eclair-mr2-plus-aosp
* commit '
9ed7dc10d263a505da32522139098f085fee811a':
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Ray Chen [Wed, 2 Dec 2009 13:35:12 +0000 (05:35 -0800)]
am
9db1a37c: am
f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '
9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp
* commit '
9db1a37cc48a01a66ee8026de303faaf4a83667d':
DATE_TAKEN should be in millisecond instead of second.
Leon Scroggins [Wed, 2 Dec 2009 13:34:39 +0000 (05:34 -0800)]
am
ad7ab8be: am
db08d5cd: (-s ours) DO NOT MERGE.
Merge commit '
ad7ab8be4774a4fbb01a50deed52e819549327a7' into eclair-mr2-plus-aosp
* commit '
ad7ab8be4774a4fbb01a50deed52e819549327a7':
DO NOT MERGE.
Dianne Hackborn [Wed, 2 Dec 2009 13:26:12 +0000 (05:26 -0800)]
am
5886050f: Merge change I0d8f7593 into eclair
Merge commit '
5886050fad97923c33cbc831fe07a5b1746b2b58' into eclair-mr2
* commit '
5886050fad97923c33cbc831fe07a5b1746b2b58':
Fix issue #
2296457: PackageManager.addPackageToPreferred needs to a no-op
Ray Chen [Wed, 2 Dec 2009 13:25:43 +0000 (05:25 -0800)]
am
f27eb326: Merge change I0b6ee9fc into eclair
Merge commit '
f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2
* commit '
f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.