13203 Commits

Author SHA1 Message Date
Jack Veenstra
55f62d1995 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.
2009-12-02 21:15:51 -08:00
Jack Veenstra
1b04daf92b 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.
2009-12-02 21:09:10 -08:00
Android (Google) Code Review
de5343290c Merge change Ica5efffe into eclair
* changes:
  Fix bug 2216426: correct the hdpi star assets for RatingBar.
2009-12-02 21:01:20 -08:00
Jack Veenstra
ca5efffec0 Fix bug 2216426: correct the hdpi star assets for RatingBar. 2009-12-02 20:14:50 -08:00
Dianne Hackborn
1dde14bc84 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
2009-12-02 19:01:31 -08:00
Dianne Hackborn
a45e925108 am dcd58cfd: Merge change I7b9328c7 into eclair
Merge commit 'dcd58cfda366c915b1f0739cb115f9d972351c73' into eclair-mr2

* commit 'dcd58cfda366c915b1f0739cb115f9d972351c73':
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 18:56:20 -08:00
Android (Google) Code Review
dcd58cfda3 Merge change I7b9328c7 into eclair
* changes:
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 18:51:19 -08:00
Dianne Hackborn
709d6db48d Fix issue #2300232: Bugs in resolving conflicting pointers
Change-Id: I7b9328c7a1c4f6b731e64cdca2ed9de71b84587f
2009-12-02 18:42:39 -08:00
Omari Stephens
15620b1eef am 21eb1738: am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '21eb173864670c2f759258016d95f0bcd06313e7' into eclair-mr2-plus-aosp

* commit '21eb173864670c2f759258016d95f0bcd06313e7':
  Revive backup tests
2009-12-02 18:32:51 -08:00
Omari Stephens
21eb173864 am 7dfecb86: Merge change Iaa6e73a6 into eclair
Merge commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54' into eclair-mr2

* commit '7dfecb86db7c3c08a0fb0f6c6b06a11eabc60c54':
  Revive backup tests
2009-12-02 18:26:05 -08:00
Android (Google) Code Review
7dfecb86db Merge change Iaa6e73a6 into eclair
* changes:
  Revive backup tests
2009-12-02 18:21:49 -08:00
Guang Zhu
26fd384011 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
2009-12-02 18:11:34 -08:00
Takaoka G. Tadashi
949851525a 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
2009-12-02 18:11:04 -08:00
Takaoka G. Tadashi
5d2a7b26d6 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
2009-12-02 18:10:34 -08:00
Dmitri Plotnikov
375b80162f 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.
2009-12-02 18:09:59 -08:00
Mathias Agopian
2aa107917b 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
2009-12-02 18:09:22 -08:00
Android (Google) Code Review
7dd3337b8e Merge change I8179742a into eclair-mr2
* changes:
  Add support for extracting render time and image in page cycler
2009-12-02 18:04:23 -08:00
Takaoka G. Tadashi
d5b325aaac Add WSP header to WAP_PUSH_RECEIVED intent in addition to data
Import CL 146651 from //branches/cupcake_dcm
2009-12-03 11:01:59 +09:00
Android (Google) Code Review
7d51517cec Merge change I611c15cf into eclair-mr2
* changes:
  Add DoCoMo vendor specific OMNA WSP content type number     Import CL 145261 from //branches/cupcake_dcm
2009-12-02 17:56:20 -08:00
Android (Google) Code Review
bbdba6414f Merge change Icae1a990 into eclair-mr2
* changes:
  Adding NAME_RAW_CONTACT_ID column to Contacts.
2009-12-02 17:55:39 -08:00
Guang Zhu
5dc4f21ab6 Add support for extracting render time and image in page cycler 2009-12-02 17:55:18 -08:00
Mike Lockwood
cd753d168f 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:
2009-12-02 17:51:09 -08:00
Mathias Agopian
96dac84be4 am 121a31ac: Merge change Id86beb99 into eclair
Merge commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c' into eclair-mr2

* commit '121a31ac3901fcb81c808da2b4a9a7cf66c12b7c':
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:50:45 -08:00
Omari Stephens
aa6e73a6c8 Revive backup tests 2009-12-02 17:39:27 -08:00
Android (Google) Code Review
121a31ac39 Merge change Id86beb99 into eclair
* changes:
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:09:46 -08:00
Mike Lockwood
f72fb68bf3 resolved conflicts for merge of 9b7dba93 to eclair-mr2
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
2009-12-02 19:57:33 -05:00
Dianne Hackborn
a0c9c173f1 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
2009-12-02 16:29:54 -08:00
Android (Google) Code Review
9b7dba936c Merge change Icc49422a into eclair
* changes:
  Implement new notification LED blinking logic:
2009-12-02 16:24:15 -08:00
Dianne Hackborn
2d8b0c3f0f 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
2009-12-02 16:23:45 -08:00
Mathias Agopian
d86beb99a7 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.
2009-12-02 16:23:11 -08:00
Android (Google) Code Review
8693f82d02 Merge change If1f0bf33 into eclair
* changes:
  Some work on issue #2286804: sometimes text field doesn't accept input
2009-12-02 16:17:54 -08:00
Jaikumar Ganesh
fafa98e51b 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.
2009-12-02 16:17:15 -08:00
Scott Main
da5a110b8a 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
2009-12-02 16:16:45 -08:00
Wink Saville
a7493240ab 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
2009-12-02 16:16:17 -08:00
Jaikumar Ganesh
f45bf8fa40 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.
2009-12-02 16:10:04 -08:00
Android (Google) Code Review
59c0627841 Merge change I721361f1 into eclair
* changes:
  Add a new priority for Auto Connection of A2DP. DO NOT MERGE.
2009-12-02 16:02:58 -08:00
Scott Main
7863eb1126 am 525bfe89: Merge change I9fb53a9c into eclair
Merge commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a' into eclair-mr2

* commit '525bfe896b8638d20e6d7a362fd089ef8e316d4a':
  add screenshots for the Bluetooth Chat sample app
2009-12-02 15:49:56 -08:00
Android (Google) Code Review
525bfe896b Merge change I9fb53a9c into eclair
* changes:
  add screenshots for the Bluetooth Chat sample app
2009-12-02 15:40:17 -08:00
Jaikumar Ganesh
721361f1a7 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
2009-12-02 15:39:59 -08:00
Dianne Hackborn
27d377221c 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
2009-12-02 15:35:35 -08:00
Eric Fischer
fecb27b3aa 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
2009-12-02 15:20:54 -08:00
Android (Google) Code Review
2f9d8dbe9f Merge change I749d6801 into eclair-mr2
* changes:
  Telephony: Fix exception if PROPERTY_OPERATOR_NUMERIC is not set and minor fixes.
2009-12-02 15:16:58 -08:00
Eric Fischer
fbc18f9b20 am 6d5c42ef: (-s ours) Merge change Id0704505 into eclair
Merge commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8' into eclair-mr2

* commit '6d5c42ef00a46e0b560b3d15ba73d89d94072af8':
  Import revised translations.  DO NOT MERGE
2009-12-02 15:11:36 -08:00
Scott Main
9fb53a9cb9 add screenshots for the Bluetooth Chat sample app 2009-12-02 15:08:19 -08:00
Wink Saville
144fdfec24 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
2009-12-02 15:07:34 -08:00
Android (Google) Code Review
6d5c42ef00 Merge change Id0704505 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-12-02 15:01:35 -08:00
Eric Fischer
d07045054d Import revised translations. DO NOT MERGE 2009-12-02 14:53:54 -08:00
Ken Shirriff
027672c168 am dfac0e5e: Merge change I3fbd0a2f into eclair-mr2
Merge commit 'dfac0e5ece844c9052d54bfde6b2cc013a818beb' into eclair-mr2-plus-aosp

* commit 'dfac0e5ece844c9052d54bfde6b2cc013a818beb':
  Generate a calendar static Java library.
2009-12-02 13:10:13 -08:00
Android (Google) Code Review
dfac0e5ece Merge change I3fbd0a2f into eclair-mr2
* changes:
  Generate a calendar static Java library.
2009-12-02 13:02:36 -08:00
Leon Scroggins
b2c13d7c8e 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.
2009-12-02 12:46:32 -08:00