Commit Graph

4591 Commits

Author SHA1 Message Date
Andreas Huber
5f47a46ab3 am 18ed7601: Merge change 24447 into eclair
Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp

* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 09:44:44 -07:00
Android (Google) Code Review
921b1c70c2 Merge change 24447 into eclair
* changes:
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 12:39:08 -04:00
Mike Lockwood
4bfd46b10b am 68f6f01c: Merge change 24527 into eclair
Merge commit '68f6f01cf62e0c282b570adf492352a5d4418584' into eclair-plus-aosp

* commit '68f6f01cf62e0c282b570adf492352a5d4418584':
  MountService: Use correct icon for SD card notifications.
2009-09-10 09:25:35 -07:00
Android (Google) Code Review
160c7df55d Merge change 24527 into eclair
* changes:
  MountService: Use correct icon for SD card notifications.
2009-09-10 12:20:49 -04:00
Snigdha Sinha
325e74c4c0 am 65736718: Merge change 24283 into eclair
Merge commit '657367185652f9877eb232b84e16fbed0d759f87' into eclair-plus-aosp

* commit '657367185652f9877eb232b84e16fbed0d759f87':
  CameraService change for OVERLAY_FORMAT_DEFAULT
2009-09-10 08:35:00 -07:00
Android (Google) Code Review
1de162ddb2 Merge change 24283 into eclair
* changes:
  CameraService change for OVERLAY_FORMAT_DEFAULT
2009-09-10 11:28:20 -04:00
Eric Laurent
fec5aefcd9 am f63e3f3c: Merge change 24512 into eclair
Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp

* commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79':
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
2009-09-10 08:17:19 -07:00
Daisuke Miyakawa
44cd493ef8 am df4edc80: Merge change 24499 into eclair
Merge commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa' into eclair-plus-aosp

* commit 'df4edc807ca32419118a9b86a3d68b0fac02f5fa':
  Modify android.syncml.pim so that no one is going to use.
2009-09-10 08:17:15 -07:00
Android (Google) Code Review
13a6dc41bd Merge change 24512 into eclair
* changes:
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
2009-09-10 11:12:03 -04:00
Android (Google) Code Review
d5ea5ca44d Merge change 24499 into eclair
* changes:
  Modify android.syncml.pim so that no one is going to use.
2009-09-10 04:22:09 -04:00
Hung-ying Tyan
fe1898ce40 am 57fc4114: Merge change 24132 into eclair
Merge commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d' into eclair-plus-aosp

* commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d':
  Add two CertTool helper classes.
2009-09-10 01:21:34 -07:00
Android (Google) Code Review
4c77a0c64b Merge change 24132 into eclair
* changes:
  Add two CertTool helper classes.
2009-09-10 04:16:56 -04:00
Tammo Spalink
2694aabe83 am a8cdbc85: Merge change 24501 into eclair
Merge commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96' into eclair-plus-aosp

* commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96':
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
2009-09-10 00:45:07 -07:00
Android (Google) Code Review
0deeb62b07 Merge change 24501 into eclair
* changes:
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
2009-09-10 03:40:54 -04:00
Jeff Sharkey
7c9ef309bf am 6ba23c59: Handle cases where TYPE can be undefined, such as EAS.
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp

* commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017':
  Handle cases where TYPE can be undefined, such as EAS.
2009-09-09 23:14:39 -07:00
Mathias Agopian
7f05c7ae32 am 24d237db: add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
Merge commit '24d237db943051942b5966f5e788d67050ec0ba5' into eclair-plus-aosp

* commit '24d237db943051942b5966f5e788d67050ec0ba5':
  add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
2009-09-09 19:25:53 -07:00
Mathias Agopian
390bd32c88 am bbe14a17: Merge change 24473 into eclair
Merge commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf' into eclair-plus-aosp

* commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf':
  fix [2074427] SurfaceView doesn't disappear on GONE
2009-09-09 19:25:49 -07:00
Mathias Agopian
a5b02e0b4d add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 2009-09-09 19:20:10 -07:00
Android (Google) Code Review
6ef94ce674 Merge change 24473 into eclair
* changes:
  fix [2074427] SurfaceView doesn't disappear on GONE
2009-09-09 22:17:45 -04:00
Dmitri Plotnikov
8554888db2 am 0d134509: Merge change 24468 into eclair
Merge commit '0d134509f4f7b05776542996f54c4d306e66dbec' into eclair-plus-aosp

* commit '0d134509f4f7b05776542996f54c4d306e66dbec':
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
2009-09-09 19:11:50 -07:00
Tammo Spalink
3f7808c536 am d0f02a4d: Merge change 24138 into eclair
Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp

* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
  Do not die when printing empty prefs.
2009-09-09 19:11:45 -07:00
Amith Yamasani
09051c6619 am 67af9f5b: Merge change 24471 into eclair
Merge commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f' into eclair-plus-aosp

* commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f':
  Fixed the fastscroll thumb asset in hdpi.
2009-09-09 19:11:40 -07:00
Android (Google) Code Review
b5791ee800 Merge change 24468 into eclair
* changes:
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
2009-09-09 22:06:48 -04:00
Android (Google) Code Review
f14259067d Merge change 24138 into eclair
* changes:
  Do not die when printing empty prefs.
2009-09-09 21:36:48 -04:00
Android (Google) Code Review
dbf0daba8f Merge change 24471 into eclair
* changes:
  Fixed the fastscroll thumb asset in hdpi.
2009-09-09 21:31:07 -04:00
Grace Kloba
36c3e91f36 am 9ca7d0c2: Merge change 24460 into eclair
Merge commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171' into eclair-plus-aosp

* commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171':
  The empty path and no path mean default path. So "a=d" should replace "a=c".
2009-09-09 18:30:15 -07:00
Android (Google) Code Review
8a56b38540 Merge change 24460 into eclair
* changes:
  The empty path and no path mean default path. So "a=d" should replace "a=c".
2009-09-09 21:23:46 -04:00
Mathias Agopian
671ea3512c am b33f92dd: Merge change 24465 into eclair
Merge commit 'b33f92dd5666134782a06b191a9025544711f85b' into eclair-plus-aosp

* commit 'b33f92dd5666134782a06b191a9025544711f85b':
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-09 17:56:40 -07:00
Scott Main
ff4127f02a am 0c910494: am aa4511cf: docs only. revise ADC2 announcement
Merge commit '0c91049482cd9467a29c2387766cfcef371d859c' into eclair-plus-aosp

* commit '0c91049482cd9467a29c2387766cfcef371d859c':
  docs only.
2009-09-09 17:52:13 -07:00
Jeff Sharkey
96f2907beb am f46a9cf3: API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp

* commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3':
  API to combine LOOKUP_KEY and Contacts._ID together.
2009-09-09 17:52:08 -07:00
Android (Google) Code Review
11a68fdf07 Merge change 24465 into eclair
* changes:
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-09 20:52:03 -04:00
Mathias Agopian
b6a5daa3ab fix [2102410] Home Screen is not displayed in the background in Landscape Mode
the blurring code now handles NPOT textures.
2009-09-09 17:47:15 -07:00
Scott Main
a9a9c8eb76 am aa4511cf: docs only. revise ADC2 announcement
Merge commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369' into eclair

* commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369':
  docs only.
2009-09-09 17:46:50 -07:00
James Stokebrand
80d13a5b93 am 16b72bbb: Merge change 24391 into eclair
Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp

* commit '16b72bbbc985cba7c59f52bf6969b4015f185830':
  RIO-7461: Update media scanner to scan AAC files.
2009-09-09 14:50:19 -07:00
Android (Google) Code Review
4aeb7e9af2 Merge change 24391 into eclair
* changes:
  RIO-7461: Update media scanner to scan AAC files. (Change in frameworks/base git)
2009-09-09 17:42:32 -04:00
Tom Taylor
9b8b231d7c am 1048ad55: Merge change 24395 into eclair
Merge commit '1048ad554ac64224c864f52266b5839cd91d4ee5' into eclair-plus-aosp

* commit '1048ad554ac64224c864f52266b5839cd91d4ee5':
  Make NumberPicker subclassable
2009-09-09 14:30:47 -07:00
Chia-chi Yeh
5049ca04da am 7dcf5c7b: Merge change 24426 into eclair
Merge commit '7dcf5c7ba82437fe197354f7d0585de20a382e4d' into eclair-plus-aosp

* commit '7dcf5c7ba82437fe197354f7d0585de20a382e4d':
  keystore: remove "#include <openssl/engine.h>".
2009-09-09 14:30:42 -07:00
Android (Google) Code Review
00bcf5ee27 Merge change 24395 into eclair
* changes:
  Make NumberPicker subclassable
2009-09-09 17:24:51 -04:00
Android (Google) Code Review
ebdf3a2d94 Merge change 24426 into eclair
* changes:
  keystore: remove "#include <openssl/engine.h>".
2009-09-09 17:04:44 -04:00
Grace Kloba
f28ef592aa am d82bc515: Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
Merge commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6' into eclair-plus-aosp

* commit 'd82bc5158c764bdd30b7d22f32258ad3c2c0c0f6':
  Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
2009-09-09 14:02:05 -07:00
Leon Scroggins
a382afebc6 am f416264a: Merge change 24398 into eclair
Merge commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87' into eclair-plus-aosp

* commit 'f416264a3b13c5965bfe1c75e9fb2a480d556f87':
  Adjust the WebTextView's text size according to density.
2009-09-09 14:02:01 -07:00
Android (Google) Code Review
ac997bd50f Merge change 24398 into eclair
* changes:
  Adjust the WebTextView's text size according to density.
2009-09-09 16:22:16 -04:00
Romain Guy
8674c7a6f2 am d380586a: Merge change 24413 into eclair
Merge commit 'd380586ac19903145e23ad3a8d073f01b4fe1192' into eclair-plus-aosp

* commit 'd380586ac19903145e23ad3a8d073f01b4fe1192':
  Remove the FallRS demo, now promoted as a wallpaper.
2009-09-09 13:19:49 -07:00
Android (Google) Code Review
a68c9b8ec2 Merge change 24413 into eclair
* changes:
  Remove the FallRS demo, now promoted as a wallpaper.
2009-09-09 16:11:30 -04:00
Nick Pelly
31c4b1b713 am 41140098: Merge change 24274 into eclair
Merge commit '411400980720895c4195c71e181831bc771a5a7b' into eclair-plus-aosp

* commit '411400980720895c4195c71e181831bc771a5a7b':
  API_CHANGE
2009-09-09 11:39:22 -07:00
Nick Pelly
445330bb04 am aadc9220: Merge change 24202 into eclair
Merge commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672' into eclair-plus-aosp

* commit 'aadc9220bd04ba8dd016fe634fabf6c91a1ce672':
  API_CHANGE
2009-09-09 11:39:16 -07:00
Android (Google) Code Review
7863838310 Merge change 24274 into eclair
* changes:
  API_CHANGE
2009-09-09 14:34:44 -04:00
Android (Google) Code Review
62bfa41b3d Merge change 24202 into eclair
* changes:
  API_CHANGE
2009-09-09 14:30:15 -04:00
Andreas Huber
709cec1e02 am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp

* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
  Calculate proper output buffer size for some more 16-bit RGB color spaces.
2009-09-09 11:29:43 -07:00
Andreas Huber
919374a7a0 am 5a65a6e2: Added a .amr file extractor (for AMR-NB and AMR-WB content).
Merge commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c' into eclair-plus-aosp

* commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c':
  Added a .amr file extractor (for AMR-NB and AMR-WB content).
2009-09-09 11:25:11 -07:00