Commit Graph

10998 Commits

Author SHA1 Message Date
Andreas Huber
55596405ff am 8d670d34: Merge change I1f1c7bad into eclair-mr2
Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp

* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
  I accidentally broke this code while refactoring MediaScanner. This is the fix.
2009-12-03 16:44:26 -08:00
Erik Gilling
7d6d559355 am 9b565d5b: am cef8d031: Merge change I00d0b54a into eclair
Merge commit '9b565d5bf38e77774956524f137d509471ae5fb2' into eclair-mr2-plus-aosp

* commit '9b565d5bf38e77774956524f137d509471ae5fb2':
  surfaceflinger: remove un-cached buffer hack for SGX
2009-12-03 16:43:05 -08:00
Dianne Hackborn
d46f3c5cef am eefe7b1b: am b2e49a23: Add API level 7.
Merge commit 'eefe7b1b3e24a84a62f1b711cc9fa4aaca4a62c6' into eclair-mr2-plus-aosp

* commit 'eefe7b1b3e24a84a62f1b711cc9fa4aaca4a62c6':
  Add API level 7.
2009-12-03 16:41:47 -08:00
Daisuke Miyakawa
108f46caa0 am 67d9aa15: Merge change I6173d7c7 into eclair-mr2
Merge commit '67d9aa15b6c6217a7d3b7b017924af132d048e56' into eclair-mr2-plus-aosp

* commit '67d9aa15b6c6217a7d3b7b017924af132d048e56':
  Add isPrintableAscii() and isPrintableAsciiOnly() to TextUtils.java as hidden methods, and make vCard code use them.
2009-12-03 16:40:50 -08:00
Andreas Huber
a05a51b81b am 2d6d609c: Merge change I74bf38a0 into eclair-mr2
Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp

* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
  Squashed commit of the following:
2009-12-03 16:40:04 -08:00
Andreas Huber
33e2e5e685 am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp

* commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
  Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
2009-12-03 16:39:27 -08:00
San Mehat
5753a740ea am d345c6ac: am 0a42b811: base: process: Abort setting the process group if one of the threads fails to switch
Merge commit 'd345c6acedb22c9408553ef9f38c196984177e6b' into eclair-mr2-plus-aosp

* commit 'd345c6acedb22c9408553ef9f38c196984177e6b':
  base: process: Abort setting the process group if one of the threads fails to switch
2009-12-03 16:38:47 -08:00
Ken Shirriff
2eda7aab90 am 4850b5cd: Merge change I20d77880 into eclair-mr2
Merge commit '4850b5cd743f4513d59ff41cd6cb548a3a9879d6' into eclair-mr2-plus-aosp

* commit '4850b5cd743f4513d59ff41cd6cb548a3a9879d6':
  Make Gservices setting constants public.
2009-12-03 16:37:27 -08:00
Jaikumar Ganesh
64a83d0f31 am 11a2853e: am 8c411fb1: Merge change I79420b02 into eclair
Merge commit '11a2853e0196905e25a2dc5c227320688e04e950' into eclair-mr2-plus-aosp

* commit '11a2853e0196905e25a2dc5c227320688e04e950':
  Add support for Car Dock.
2009-12-03 16:36:29 -08:00
Scott Main
b4a80ce5b4 am 7f1ab539: am 90d311ff: Merge change I33e0f00e into eclair
Merge commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b' into eclair-mr2-plus-aosp

* commit '7f1ab539ceb56182d36d8782171a2dd84f96ea3b':
  docs: fix markup error in xml sample
2009-12-03 16:35:39 -08:00
Dave Sparks
6fb1ac4695 am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2
Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp

* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
  Remove old hack A/V sync hack that is no longer needed.
2009-12-03 16:34:07 -08:00
Mike Lockwood
310932452e am 44000eb2: am 678c2e35: Merge change I9ef88863 into eclair
Merge commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc' into eclair-mr2-plus-aosp

* commit '44000eb2a2340b1a47eaa587d4829810e04cbcdc':
  Add WindowManagerPolicy.OFF_BECAUSE_OF_PROX_SENSOR to indicate screen was turned off by the proximity sensor.
2009-12-03 16:33:14 -08:00
Ray Chen
57cca76506 am 1b794bbb: am e12de4d5: Merge change Id5fa58cf into eclair
Merge commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497' into eclair-mr2-plus-aosp

* commit '1b794bbbdc961558a9f0ee956d9d3f684d1f0497':
  Fix timezone issue to comply with EXIF standard.
2009-12-03 16:31:56 -08:00
Vasu Nori
6729838501 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.
2009-12-03 16:31:03 -08:00
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
Android (Google) Code Review
7e838f4ced Merge change I85e5d39e into eclair-mr2
* changes:
  Two more uses of strlcpy that break the sim build. Now fixed.
2009-12-03 16:27:16 -08:00
Jason Sams
f60b136442 am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair
Merge commit '5c49a9080df9e46193efa8326318c86bc8976eea' into eclair-mr2

* commit '5c49a9080df9e46193efa8326318c86bc8976eea':
  DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices.  If we see a 0 texture id during bind for rendering, attempt to re-upload.  If this fails log debug info and restart the app.
2009-12-03 16:23:23 -08:00
Android (Google) Code Review
f281db10d3 Merge change Ic73ec39b into eclair
* changes:
  DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices.  If we see a 0 texture id during bind for rendering, attempt to re-upload.  If this fails log debug info and restart the app.
2009-12-03 16:15:46 -08:00
Scott Main
f5b4e6bab4 Merge branch 'eclair-mr2' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2 2009-12-03 16:14:13 -08:00
Scott Main
04710b1b3e am 5d0806c9: Merge change Ia70bd8c4 into eclair
Merge commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6' into eclair-mr2

* commit '5d0806c9c3e0e6c8673ac4238f8ec2e0f82ad7e6':
  add BluetoothChat sample app to the dev guide
2009-12-03 16:13:19 -08:00
Android (Google) Code Review
8691e9ef19 Merge change Ia70bd8c4 into eclair
* changes:
  add BluetoothChat sample app to the dev guide
2009-12-03 16:06:52 -08:00
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
Joe Onorato
b32dae9a2a am a6c4556d: am a8974b63: am 19a4157c: Make the notification panel send the position as well.
Merge commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda'

* commit 'a6c4556dea7d498783aff8a38e0e50c2b172beda':
  Make the notification panel send the position as well.
2009-12-03 10:54:04 -08:00
Joe Onorato
123b480117 am 963559ec: am 6c5401d8: am 7597065d: Make RemoteViews also set the sourceBounds in the PendingIntent.
Merge commit '963559ec0a2a8eaf118b4bbcedaa7274ef8909f2'

* commit '963559ec0a2a8eaf118b4bbcedaa7274ef8909f2':
  Make RemoteViews also set the sourceBounds in the PendingIntent.
2009-12-03 10:52:35 -08:00
Joe Onorato
6d7a0a9e01 am dbed5350: 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 'dbed53504f515337ccc2f60248bb589dff0f24fb'

* commit 'dbed53504f515337ccc2f60248bb589dff0f24fb':
  Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
2009-12-03 10:51:34 -08:00
Dmitri Plotnikov
8d7fa44c42 am 772e90a4: am 780211a9: Fixing broken build
Merge commit '772e90a42745e4958e25c7dd7122d3f6be4998c7'

* commit '772e90a42745e4958e25c7dd7122d3f6be4998c7':
  Fixing broken build
2009-12-03 10:50:10 -08:00
Li Wenhao
87dd279ae7 am f8625381: am 2b3509c9: Merge change I51438c18 into eclair-mr2
Merge commit 'f86253816b7166096111d29cb3708b1156f7ebf3'

* commit 'f86253816b7166096111d29cb3708b1156f7ebf3':
  the vertex index should be "first + i".
2009-12-03 10:48:17 -08:00
Jack Veenstra
751e798f01 am 55f62d19: am 1b04daf9: am de534329: Merge change Ica5efffe into eclair
Merge commit '55f62d1995404219d4f491b2f19befaa7c6f632f'

* commit '55f62d1995404219d4f491b2f19befaa7c6f632f':
  Fix bug 2216426: correct the hdpi star assets for RatingBar.
2009-12-03 10:47:21 -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