Commit Graph

8557 Commits

Author SHA1 Message Date
Daniel Sandler
45559eb6da 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.
2009-12-03 16:30:21 -08:00
Daniel Sandler
87043e06ce 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.
2009-12-03 08:42:34 -08:00
Wu-cheng Li
2569d0e98d 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.
2009-12-03 00:22:43 -08:00
Wu-cheng Li
3f6e728c57 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.
2009-12-03 00:16:35 -08:00
Joe Onorato
4f98b6fe64 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.
2009-12-02 23:39:16 -08:00
Joe Onorato
5112d38bd6 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.
2009-12-02 23:33:56 -08:00
Joe Onorato
e78df40342 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.
2009-12-02 23:22:52 -08:00
Joe Onorato
8e426e53da 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
2009-12-02 23:22:19 -08:00
Joe Onorato
01d0080fd1 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.
2009-12-02 23:16:11 -08:00
Joe Onorato
26882a628e 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
2009-12-02 22:40:57 -08:00
Dmitri Plotnikov
9e03869700 am 780211a9: Fixing broken build
Merge commit '780211a9a792dcc4cd57df0a4e8da34d05eb99f1' into eclair-mr2-plus-aosp

* commit '780211a9a792dcc4cd57df0a4e8da34d05eb99f1':
  Fixing broken build
2009-12-02 22:08:38 -08:00
Li Wenhao
1ded70bc14 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".
2009-12-02 21:24:48 -08:00
Android (Google) Code Review
bd396e8b0f Merge change I51438c18 into eclair-mr2
* changes:
  the vertex index should be "first + i".
2009-12-02 21:17:57 -08:00
Jack Veenstra
8373b6432a 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
55403fe1b4 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
1a16327e47 Merge change Ica5efffe into eclair
* changes:
  Fix bug 2216426: correct the hdpi star assets for RatingBar.
2009-12-02 21:01:20 -08:00
Dianne Hackborn
d36d96dad3 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
269bf92fad 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
a584cbe32f Merge change I7b9328c7 into eclair
* changes:
  Fix issue #2300232: Bugs in resolving conflicting pointers
2009-12-02 18:51:19 -08:00
Omari Stephens
142f14df6d 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
ef67e0dd0e 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
0c285c1294 Merge change Iaa6e73a6 into eclair
* changes:
  Revive backup tests
2009-12-02 18:21:49 -08:00
Guang Zhu
31feefdbce 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
b7b511efc9 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
f5232ebc11 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
f83e50807f 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
6094f64f01 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
948b9e6f14 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
Android (Google) Code Review
b0cc59cdf7 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
9322313e6b Merge change Icae1a990 into eclair-mr2
* changes:
  Adding NAME_RAW_CONTACT_ID column to Contacts.
2009-12-02 17:55:39 -08:00
Mike Lockwood
fe30eef071 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
fd70b7f335 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
Android (Google) Code Review
91e4152760 Merge change Id86beb99 into eclair
* changes:
  fix [2291418] Camera preview cannot work in Emulator
2009-12-02 17:09:46 -08:00
Mike Lockwood
a59a9d25e2 resolved conflicts for merge of 9b7dba93 to eclair-mr2
Change-Id: I9a5412b8812aebc934540b1f6f9a9f9c96d89f59
2009-12-02 19:57:33 -05:00
Dianne Hackborn
a0a1e92cac 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
c15de03df8 Merge change Icc49422a into eclair
* changes:
  Implement new notification LED blinking logic:
2009-12-02 16:24:15 -08:00
Dianne Hackborn
44fe74c901 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
3e8a81e354 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
4fb7951251 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
354ed78018 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
d843639588 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
d776a26b8e 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
11ed4774c1 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
7db8f45d8b 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
aa01214bcb 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
574101140a Merge change I9fb53a9c into eclair
* changes:
  add screenshots for the Bluetooth Chat sample app
2009-12-02 15:40:17 -08:00
Eric Fischer
a73aa261dc 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
1d9c8f8ff8 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
1cccb28efa 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
Android (Google) Code Review
75aa7bddc7 Merge change Id0704505 into eclair
* changes:
  Import revised translations.  DO NOT MERGE
2009-12-02 15:01:35 -08:00