15668 Commits

Author SHA1 Message Date
Mike Lockwood
20e7c267c8 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
29d503c6cc 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
25bd4f29e1 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
09380e0232 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
2a428fd463 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
9737dc4de2 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
Andreas Huber
85e5d39e60 Two more uses of strlcpy that break the sim build. Now fixed. 2009-12-03 16:22:52 -08:00
Android (Google) Code Review
5c49a9080d 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
9f0fa1f4c1 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
e08361d7fd 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
Andreas Huber
805cc709b7 Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build. 2009-12-03 16:07:05 -08:00
Android (Google) Code Review
5d0806c9c3 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
8d670d3458 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
Andreas Huber
1f1c7bad42 I accidentally broke this code while refactoring MediaScanner. This is the fix. 2009-12-03 15:45:53 -08:00
Jason Sams
c73ec39bd0 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 15:43:18 -08:00
Scott Main
14a704295f add BluetoothChat sample app to the dev guide 2009-12-03 15:42:50 -08:00
Erik Gilling
9b565d5bf3 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
cef8d031e8 Merge change I00d0b54a into eclair
* changes:
  surfaceflinger: remove un-cached buffer hack for SGX
2009-12-03 15:30:23 -08:00
Dianne Hackborn
eefe7b1b3e 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
Fred Quintana
aa7edda471 don't reschedule syncs that failed with a tooManyRetries error 2009-12-03 14:18:58 -08:00
Dianne Hackborn
b2e49a2319 Add API level 7.
Change-Id: Id87dc724f0758ce0faee9c00621d4af6cb9f5bd9
2009-12-03 14:13:53 -08:00
Erik Gilling
00d0b54af1 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
67d9aa15b6 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
2d6d609c9e Merge change I74bf38a0 into eclair-mr2
* changes:
  Squashed commit of the following:
2009-12-03 13:27:08 -08:00
Andreas Huber
bfb9fb143b Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore. 2009-12-03 13:21:54 -08:00
Andreas Huber
b0caf946b7 Squashed commit of the following:
commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 3 11:33:57 2009 -0800

    stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...

commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date:   Wed Dec 2 12:39:07 2009 -0800

    More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
2009-12-03 12:49:09 -08:00
San Mehat
d345c6aced 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
San Mehat
0a42b811ae base: process: Abort setting the process group if one of the threads fails to switch
Signed-off-by: San Mehat <san@google.com>
2009-12-03 12:23:00 -08:00
Naveen Kalla
6c84d7313e Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Tone format for TONE_CDMA_ANSWER should be 660Hz + 1000Hz, with a 500ms ON
duration.
2009-12-03 12:17:18 -08:00
Android (Google) Code Review
4850b5cd74 Merge change I20d77880 into eclair-mr2
* changes:
  Make Gservices setting constants public.
2009-12-03 12:10:12 -08:00
Jaikumar Ganesh
11a2853e01 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
7f1ab539ce 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
8c411fb139 Merge change I79420b02 into eclair
* changes:
  Add support for Car Dock.
2009-12-03 11:49:38 -08:00
Android (Google) Code Review
90d311ff33 Merge change I33e0f00e into eclair
* changes:
  docs: fix markup error in xml sample
2009-12-03 11:40:22 -08:00
Jaikumar Ganesh
3fbf7b62bb Add support for Car Dock.
Dr No: Eastham
Bug: 2133530
2009-12-03 11:35:37 -08:00
Scott Main
33e0f00e95 docs: fix markup error in xml sample 2009-12-03 11:33:25 -08:00
Android (Google) Code Review
7c09a0ff36 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
Maryam Garrett
ce08379e22 Improves the touch-based text selection UI in text boxes.
With this change, when a user is in "text select" mode, they
can swipe any part of the text. This changes the behavior of
the touch-based select in 2 ways (behavior for cursor-based
select remains the same):

1. You can now indicate where your select will start. Before
this change, the select always started at the last cursor
position.

2. Selection will respect word boundaries. Before this
change the selection would be character to character. Since
users don't have a fine grain level of control over touch
events, this would often lead to incomplete selections.
2009-12-03 14:20:53 -05:00
Mike Lockwood
44000eb2a2 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
678c2e3576 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
06253f58fb 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
9bc849586e 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
8da7873f94 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
37416c44c0 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
55481bb77d 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
9d6ed5393f 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
1b794bbbdc 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
e12de4d504 Merge change Id5fa58cf into eclair
* changes:
  Fix timezone issue to comply with EXIF standard.
2009-12-03 10:24:18 -08:00
Dave Sparks
b904c2a452 Remove old hack A/V sync hack that is no longer needed. 2009-12-03 10:13:32 -08:00
Vasu Nori
6d1ec0d81c 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.
2009-12-03 10:01:20 -08:00