8302 Commits

Author SHA1 Message Date
Amith Yamasani
529bda79cc am b02c4c41: am 67af9f5b: Merge change 24471 into eclair
Merge commit 'b02c4c41f575c23ee5158931de8278fc1f0e0c75'

* commit 'b02c4c41f575c23ee5158931de8278fc1f0e0c75':
  Fixed the fastscroll thumb asset in hdpi.
2009-09-09 19:16:35 -07:00
Amith Yamasani
b02c4c41f5 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
Grace Kloba
6e08757d65 am 416bfd60: am 9ca7d0c2: Merge change 24460 into eclair
Merge commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e'

* commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e':
  The empty path and no path mean default path. So "a=d" should replace "a=c".
2009-09-09 18:35:09 -07:00
Android (Google) Code Review
67af9f5bf1 Merge change 24471 into eclair
* changes:
  Fixed the fastscroll thumb asset in hdpi.
2009-09-09 21:31:07 -04:00
Grace Kloba
416bfd60ee 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
Amith Yamasani
da256fabed Fixed the fastscroll thumb asset in hdpi.
Asset was 1 pixel taller than necessary and was causing scaling artifacts.
2009-09-09 18:28:44 -07:00
Android (Google) Code Review
9ca7d0c2ef 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
Grace Kloba
d0990d4a78 The empty path and no path mean default path. So "a=d" should replace "a=c". 2009-09-09 18:22:44 -07:00
Mathias Agopian
36e40a1f22 am 0df661eb: am b33f92dd: Merge change 24465 into eclair
Merge commit '0df661eb70488c846d7d925695667ed22e15385c'

* commit '0df661eb70488c846d7d925695667ed22e15385c':
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-09 18:01:24 -07:00
Scott Main
90adb47d95 am e3a3a872: am 0c910494: am aa4511cf: docs only. revise ADC2 announcement
Merge commit 'e3a3a872a9ad7ee579c05d35125552a93f8ff031'

* commit 'e3a3a872a9ad7ee579c05d35125552a93f8ff031':
  docs only.
2009-09-09 18:01:19 -07:00
Jeff Sharkey
8a199ad070 am 55f8ac79: am f46a9cf3: API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a'

* commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a':
  API to combine LOOKUP_KEY and Contacts._ID together.
2009-09-09 18:01:14 -07:00
Mathias Agopian
0df661eb70 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
e3a3a872a9 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
55f8ac79bf 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
b33f92dd56 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
e7c11d770a 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
0c91049482 am aa4511cf: docs only. revise ADC2 announcement
Merge commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369' into eclair

* commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369':
  docs only.
2009-09-09 17:46:50 -07:00
Jeff Sharkey
f46a9cf382 API to combine LOOKUP_KEY and Contacts._ID together. 2009-09-09 17:41:18 -07:00
Scott Main
aa4511cfcd docs only.
revise ADC2 announcement

Change-Id: Ia2130b8c334053e8e27a4ab680f3bcf57de9504b
2009-09-09 17:36:09 -07:00
James Stokebrand
36f5e74f83 am 7ff0d9a6: am 16b72bbb: Merge change 24391 into eclair
Merge commit '7ff0d9a60ab6af7025eb283d01158f0fd4736173'

* commit '7ff0d9a60ab6af7025eb283d01158f0fd4736173':
  RIO-7461: Update media scanner to scan AAC files.
2009-09-09 16:30:52 -07:00
Tom Taylor
3c0b799802 am be52ad33: am 1048ad55: Merge change 24395 into eclair
Merge commit 'be52ad33c73411d88a2e5c41aa9c3e55baf154e6'

* commit 'be52ad33c73411d88a2e5c41aa9c3e55baf154e6':
  Make NumberPicker subclassable
2009-09-09 16:30:31 -07:00
Chia-chi Yeh
27e89b397b am 1b2ba40e: am 7dcf5c7b: Merge change 24426 into eclair
Merge commit '1b2ba40ee990d53ee0157bc745e4762102b0c9af'

* commit '1b2ba40ee990d53ee0157bc745e4762102b0c9af':
  keystore: remove "#include <openssl/engine.h>".
2009-09-09 16:30:26 -07:00
Grace Kloba
99f9890d29 am a8f0f77b: 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 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265'

* commit 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265':
  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 16:29:55 -07:00
Leon Scroggins
529e6fae15 am 6f1c854a: am f416264a: Merge change 24398 into eclair
Merge commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185'

* commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185':
  Adjust the WebTextView's text size according to density.
2009-09-09 16:29:50 -07:00
Romain Guy
5a51a91c2e am de311222: am d380586a: Merge change 24413 into eclair
Merge commit 'de3112227a6e7696fc41116b8461aca105e9f662'

* commit 'de3112227a6e7696fc41116b8461aca105e9f662':
  Remove the FallRS demo, now promoted as a wallpaper.
2009-09-09 16:29:28 -07:00
Nick Pelly
38615fc692 am bf765b6c: am 41140098: Merge change 24274 into eclair
Merge commit 'bf765b6c70c0cc5e494c1361747d3b93e98d962d'

* commit 'bf765b6c70c0cc5e494c1361747d3b93e98d962d':
  API_CHANGE
2009-09-09 16:28:58 -07:00
Nick Pelly
3f51fee5f7 am 16a54b28: am aadc9220: Merge change 24202 into eclair
Merge commit '16a54b2861209a13194b02f7882a0ec247b69060'

* commit '16a54b2861209a13194b02f7882a0ec247b69060':
  API_CHANGE
2009-09-09 16:28:52 -07:00
Andreas Huber
75a201626d am e180af03: am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit 'e180af0335b9423bd7c0d764ac3819bd4ee88d37'

* commit 'e180af0335b9423bd7c0d764ac3819bd4ee88d37':
  Calculate proper output buffer size for some more 16-bit RGB color spaces.
2009-09-09 16:28:13 -07:00
Andreas Huber
d59e166efe am 13a26677: am 5a65a6e2: Added a .amr file extractor (for AMR-NB and AMR-WB content).
Merge commit '13a26677816cf2b66b34eab2cedb0cdfe541a17c'

* commit '13a26677816cf2b66b34eab2cedb0cdfe541a17c':
  Added a .amr file extractor (for AMR-NB and AMR-WB content).
2009-09-09 16:28:05 -07:00
Andreas Huber
364eedd318 am 022ed17c: am 4e60d7e6: Merge change 24179 into eclair
Merge commit '022ed17cddb0bfb47e587e9b0db93f7b342d2b65'

* commit '022ed17cddb0bfb47e587e9b0db93f7b342d2b65':
  Support encoding amr-wb content in stagefright.
2009-09-09 16:28:00 -07:00
Jaikumar Ganesh
80626de799 am b962208d: am 100f0861: Merge change 24376 into eclair
Merge commit 'b962208d8ec529b8cc07c3bc44732603010bd691'

* commit 'b962208d8ec529b8cc07c3bc44732603010bd691':
  Query for all properties if a property change is received and cache is empty.
2009-09-09 16:27:47 -07:00
Andrei Popescu
d2a43c36e4 am 0faff7b0: am cf7b5521: Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
Merge commit '0faff7b0cc06ffb933763a9494056a8ec132183a'

* commit '0faff7b0cc06ffb933763a9494056a8ec132183a':
  Remove the call to nativeAddJavascriptInterface() from BrowserFrame::addJavascriptInterface() as it causes an intermitent crash.
2009-09-09 16:27:16 -07:00
Grace Kloba
a9af25befb am b84214a3: am ccda4c49: Merge change 24288 into eclair
Merge commit 'b84214a329963be9e156f771c3c8d142280882d7'

* commit 'b84214a329963be9e156f771c3c8d142280882d7':
  Do not cache POST response as Cache is indexed with url.
2009-09-09 16:26:39 -07:00
Andy McFadden
ed61d9ec9e am 894d083e: am b9e52a07: Fix sim-eng build.
Merge commit '894d083ec1bcdc52996fbf3d6cd10823262e47fc'

* commit '894d083ec1bcdc52996fbf3d6cd10823262e47fc':
  Fix sim-eng build.
2009-09-09 16:26:34 -07:00
James Stokebrand
7ff0d9a60a 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
16b72bbbc9 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
be52ad33c7 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
1b2ba40ee9 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
1048ad554a Merge change 24395 into eclair
* changes:
  Make NumberPicker subclassable
2009-09-09 17:24:51 -04:00
Android (Google) Code Review
7dcf5c7ba8 Merge change 24426 into eclair
* changes:
  keystore: remove "#include <openssl/engine.h>".
2009-09-09 17:04:44 -04:00
Grace Kloba
a8f0f77b2e 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
6f1c854a9e 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
Grace Kloba
d82bc5158c 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.
Fix http://b/issue?id=2099889
2009-09-09 13:53:02 -07:00
Mathias Agopian
7151176f86 am 1d9161e2: am 11c803ac: Merge change 24335 into eclair
Merge commit '1d9161e2624e3b2b7e4671dc5be8547a06d35fe8'

* commit '1d9161e2624e3b2b7e4671dc5be8547a06d35fe8':
  use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
2009-09-09 13:42:47 -07:00
Mathias Agopian
88a1f4c25e am 44187ac0: am 72e2d6da: Merge change 24334 into eclair
Merge commit '44187ac07c73dc3ad0d3e9f9da432edffab0829d'

* commit '44187ac07c73dc3ad0d3e9f9da432edffab0829d':
  fix [2037525] Fail to start camera after adb sync new Camera
2009-09-09 13:42:42 -07:00
Mathias Agopian
ab4b4ab913 am dfc6ca96: am 0a5bf257: Merge change 24333 into eclair
Merge commit 'dfc6ca96529319613e744092d7dffeae70bf35e3'

* commit 'dfc6ca96529319613e744092d7dffeae70bf35e3':
  rename Mutexes to make the code easier to follow
2009-09-09 13:42:37 -07:00
Chung-yih Wang
591a16220b am 53fb67a8: am 0c065d9e: Merge change 24117 into eclair
Merge commit '53fb67a8196e75965a5042fdbd83d266980420d9'

* commit '53fb67a8196e75965a5042fdbd83d266980420d9':
  Replace the delimiter whitespace with '\0'.
2009-09-09 13:42:15 -07:00
Eric Laurent
7fae310537 am d3a31996: am db603b0b: Merge change 24114 into eclair
Merge commit 'd3a31996e6ef915bc25ff67f1f35274447a14862'

* commit 'd3a31996e6ef915bc25ff67f1f35274447a14862':
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-09 13:41:53 -07:00
Tammo Spalink
54807f3b5e am e579dc1c: am 997eddb0: Merge change 24318 into eclair
Merge commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1'

* commit 'e579dc1cc55648c3b8b81560214c47c9adee81f1':
  Avoid CDMA messages with IDs of zero.
2009-09-09 13:41:40 -07:00
Omari Stephens
99af2813e0 am c5e15ad7: am 948ef29e: Merge change 24316 into eclair
Merge commit 'c5e15ad767b4ff92d4eb85655b6e5fd517c0ae93'

* commit 'c5e15ad767b4ff92d4eb85655b6e5fd517c0ae93':
  Fix typo: IMMEDITATE -> IMMEDIATE
2009-09-09 13:41:17 -07:00