Commit Graph

8924 Commits

Author SHA1 Message Date
Android (Google) Code Review
6360ea394c Merge change I1f1c7bad into eclair-mr2
* changes:
  I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-03 15:51:09 -08:00
Erik Gilling
19b18d75fe am cef8d031: Merge change I00d0b54a into eclair
Merge commit 'cef8d031e842b773bbd6481b517996a185391e92' into eclair-mr2

* commit 'cef8d031e842b773bbd6481b517996a185391e92':
  surfaceflinger: remove un-cached buffer hack for SGX
2009-12-03 15:35:55 -08:00
Android (Google) Code Review
aa3255a32d Merge change I00d0b54a into eclair
* changes:
  surfaceflinger: remove un-cached buffer hack for SGX
2009-12-03 15:30:23 -08:00
Dianne Hackborn
8c7289f864 am b2e49a23: Add API level 7.
Merge commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9' into eclair-mr2

* commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9':
  Add API level 7.
2009-12-03 14:52:46 -08:00
Erik Gilling
1bd48776eb surfaceflinger: remove un-cached buffer hack for SGX
Signed-off-by: Erik Gilling <konkers@android.com>
2009-12-03 14:09:31 -08:00
Android (Google) Code Review
0f756526a7 Merge change I6173d7c7 into eclair-mr2
* changes:
  Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
2009-12-03 13:55:07 -08:00
Android (Google) Code Review
04427e50a7 Merge change I74bf38a0 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-12-03 13:27:08 -08:00
San Mehat
de15958a13 am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit '0a42b811aea490a9a605b75f0320101f6eafd283' into eclair-mr2

* commit '0a42b811aea490a9a605b75f0320101f6eafd283':
  base: process: Abort setting the process group if one of the threads fails to switch
2009-12-03 12:45:59 -08:00
Android (Google) Code Review
23ea02a42d Merge change I20d77880 into eclair-mr2
* changes:
  Make Gservices setting constants public.
2009-12-03 12:10:12 -08:00
Jaikumar Ganesh
c3a97de6ba am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338' into eclair-mr2

* commit '8c411fb13923d1fa28fcd98452bf3d17b8b1a338':
  Add support for Car Dock.
2009-12-03 12:01:38 -08:00
Scott Main
4f4aac4f0e am 90d311ff: Merge change I33e0f00e into eclair
Merge commit '90d311ff33f33024f642ef03a02fb62566c9f46b' into eclair-mr2

* commit '90d311ff33f33024f642ef03a02fb62566c9f46b':
  docs: fix markup error in xml sample
2009-12-03 11:54:43 -08:00
Android (Google) Code Review
417fe604e9 Merge change I79420b02 into eclair
* changes:
  Add support for Car Dock.
2009-12-03 11:49:38 -08:00
Android (Google) Code Review
438e014812 Merge change I33e0f00e into eclair
* changes:
  docs: fix markup error in xml sample
2009-12-03 11:40:22 -08:00
Android (Google) Code Review
3b58525563 Merge change Ib904c2a4 into eclair-mr2
* changes:
  Remove old hack A/V sync hack that is no longer needed.
2009-12-03 11:25:54 -08:00
Mike Lockwood
6dadfe46b1 am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '678c2e35768a5426b4ad8f67c836008e7751a353' into eclair-mr2

* commit '678c2e35768a5426b4ad8f67c836008e7751a353':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 11:18:48 -08:00
Android (Google) Code Review
e1e7196c0f Merge change I9ef88863 into eclair
* changes:
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 10:59:25 -08:00
Ray Chen
7cdf90390d am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1' into eclair-mr2

* commit 'e12de4d5041e05f77cc4376a6bfc953a48e2c3c1':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:35:45 -08:00
Android (Google) Code Review
244d729805 Merge change Id5fa58cf into eclair
* changes:
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:24:18 -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