Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,663 Commits 3 Branches 0 Tags
df3fa9efb4574edb4ea7633eba068f9f1843f503
Commit Graph

11663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Millar
df3fa9efb4 am 1fe17c5f: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82'

* commit '1fe17c5f2f6dd288e60f6ce7d04f491a23f53e82':
  [Issue 2165234] Removing nickname clusters: John/Jack and Patrick/Rick.
 2009-10-12 12:39:58 -07:00
Nick Pelly
4241edce08 am e0d67dfc: am d7ebc7a4: am 7a865a5d: Merge change Ieed8be00 into eclair 
Merge commit 'e0d67dfc8fced2a5131df40d1ff585c00d91da72'

* commit 'e0d67dfc8fced2a5131df40d1ff585c00d91da72':
 2009-10-12 12:39:02 -07:00
Nick Pelly
dffcd85541 am b2ad0f18: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84'

* commit 'b2ad0f18bc030535687aed67f5c3a3139045dd84':
  Introduce BluetoothAdapter.getDefaultAdapter().
 2009-10-12 12:38:48 -07:00
Nick Pelly
c0cfe8f526 am 10a55765: am 55a17d6e: am dc2ccb82: Merge change Ia4879943 into eclair 
Merge commit '10a5576559def7bbd481527c07fd1f94d6eef900'

* commit '10a5576559def7bbd481527c07fd1f94d6eef900':
 2009-10-12 12:36:15 -07:00
David 'Digit' Turner
de553351bf am 4c220bd0: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '4c220bd0f32b93314c4c1bff328bd815265ef117'

* commit '4c220bd0f32b93314c4c1bff328bd815265ef117':
  Encourage developers to connect RFCOMM by UUID instead of Channel.
 2009-10-12 12:36:03 -07:00
Romain Guy
66e146b30d am 3504ec10: am 1f42439a: am 35b38cef: Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits format when the window is 32 bits. 
Merge commit '3504ec10833f7aad7b2f2ea253de8bebaf811455'

* commit '3504ec10833f7aad7b2f2ea253de8bebaf811455':
 2009-10-12 12:35:16 -07:00
Romain Guy
a0b663bbc7 am ff9c48b3: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0'

* commit 'ff9c48b3040833c7b3f85bcac116ba5f0dd247d0':
  Improve drawing cache speed by selecting the correct opacity and keeping a 32 bits
 2009-10-12 12:35:06 -07:00
Andreas Huber
ea745866de am 1e988a04: am f894d111: Merge change I6c32aa75 into eclair-mr2 
Merge commit '1e988a04b55fcaab6116b8d565b68b4f62d01633'

* commit '1e988a04b55fcaab6116b8d565b68b4f62d01633':
  Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
 2009-10-12 12:34:08 -07:00
Mike Reed
16501b3fc8 am 8e9d080e: am 1665b48f: am 64dd5be5: Merge change Ia78b0a2d into eclair 
Merge commit '8e9d080e44bc867da2a1aa6677e3de98931be9ea'

* commit '8e9d080e44bc867da2a1aa6677e3de98931be9ea':
 2009-10-12 12:33:56 -07:00
Jeff Hamilton
1d4eb8843e am 254d7ecd: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9'

* commit '254d7ecd06aabc54fb1d2b9afd53b6e78045c6a9':
  add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque.
 2009-10-12 12:33:44 -07:00
Amith Yamasani
92f72ec1bc am 360fde8e: am 446aeb1c: Merge change Ia98129b9 into eclair-mr2 
Merge commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107'

* commit '360fde8eabdc9c45d1b52e350ccfb4bac9d93107':
  Fix preference caching to increase recycling of preference views.
 2009-10-12 12:32:39 -07:00
Elliott Hughes
ce2d60e91e am 4f0c414c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '4f0c414c091daa54ac7997b7438995279506f791'

* commit '4f0c414c091daa54ac7997b7438995279506f791':
 2009-10-12 12:32:28 -07:00
Eric Fischer
bd08893873 am 6a230c10: (-s ours) am 6756e440: am e4b6639d: (-s ours) Merge change I9db1edea into eclair 
Merge commit '6a230c105a9d74c813b106689539b82fbda7d9b4'

* commit '6a230c105a9d74c813b106689539b82fbda7d9b4':
  Import revised translations.   DO NOT MERGE
 2009-10-12 12:32:07 -07:00
Dianne Hackborn
755d3cf20c am c4f52bd7: am 7e5c5d97: am 0c3154d3: Fix issue #2163654: deadlock, runtime restart 
Merge commit 'c4f52bd7550f57b1d483091a71871653d8928901'

* commit 'c4f52bd7550f57b1d483091a71871653d8928901':
  Fix issue #2163654: deadlock, runtime restart
 2009-10-12 12:31:56 -07:00
Robert Greenwalt
5a62992ad9 am 91f36086: am c24c0e9b: Merge change Ib8f16340 into eclair-mr2 
Merge commit '91f360869e3cf845043ccef31f9a6ab8f57b2896'

* commit '91f360869e3cf845043ccef31f9a6ab8f57b2896':
  Fix ConnectivityManager permissions check.
 2009-10-12 12:31:46 -07:00
Cary Clark
56f726cbb6 am fface18d: am 5da9aeb4: reset webTextView size if focus bounds changes 
Merge commit 'fface18d254900cff57623c364f47d929b4089f6'

* commit 'fface18d254900cff57623c364f47d929b4089f6':
  reset webTextView size if focus bounds changes
 2009-10-12 12:29:36 -07:00
Bjorn Bringert
e3b90ecd3f am ef8e6b56: am 19400067: am 4625758d: Merge change I2c5f1e76 into eclair 
Merge commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b'

* commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b':
  Fix back button handling in ACTV
 2009-10-12 12:28:50 -07:00
Fred Quintana
a1933d7dfc am 7fc5e5ab: am f9f7718f: am f038004f: changes from Sync Manager API Review: bug 2164262 
Merge commit '7fc5e5ab6d404d13136d30b724975798717f57f0'

* commit '7fc5e5ab6d404d13136d30b724975798717f57f0':
  changes from Sync Manager API Review: bug 2164262
 2009-10-12 12:28:37 -07:00
Mathias Agopian
ab24da10b6 am e52d5ffb: am 2504fba7: am 460b60c9: Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes." 
Merge commit 'e52d5ffb43f6cd6c2e37c4e636e39162464cfcf5'

* commit 'e52d5ffb43f6cd6c2e37c4e636e39162464cfcf5':
  Revert "temporarily disable the use of glTexImage2D for sw buffers on sholes."
 2009-10-12 12:28:02 -07:00
Brett Chabot
bf90c1ed6d am d7dc2c47: am baa44f11: am 773fd131: Merge change I3429f77a into eclair 
Merge commit 'd7dc2c47745947b56ea33e36f69c3d8926524549'

* commit 'd7dc2c47745947b56ea33e36f69c3d8926524549':
  Suppress flaky test HeapTest#testOomeLarge.
 2009-10-12 12:27:08 -07:00
Mathias Agopian
3be537ea72 am e3aa2ada: am 5fd0ea8f: am 26fe45dc: Merge change I4961c959 into eclair 
Merge commit 'e3aa2ada1931be2b66636aeb7296b20df8dbae09'

* commit 'e3aa2ada1931be2b66636aeb7296b20df8dbae09':
  fix [2152536] ANR in browser
 2009-10-12 12:26:55 -07:00
Eric Laurent
b0b3c14d89 am 82162049: am 4e362817: am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high). 
Merge commit '821620494f0f073a27124e96139d5320df79d7e4'

* commit '821620494f0f073a27124e96139d5320df79d7e4':
  Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
 2009-10-12 12:26:44 -07:00
Romain Guy
eb29a2533b am dba99815: am 72da3a46: am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices. 
Merge commit 'dba9981588503dbfc442216a857ff001f46fff60'

* commit 'dba9981588503dbfc442216a857ff001f46fff60':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
 2009-10-12 12:26:34 -07:00
Mathias Agopian
50bc57cd0f am 84a379cc: am 160e97cb: am c131c567: temporarily disable the use of glTexImage2D for sw buffers on sholes. 
Merge commit '84a379cc0615b2c1682d99ed286c6d3cb2e114fe'

* commit '84a379cc0615b2c1682d99ed286c6d3cb2e114fe':
  temporarily disable the use of glTexImage2D for sw buffers on sholes.
 2009-10-12 12:26:24 -07:00
android-build SharedAccount
fd2f0a9425 merged d7c18d7672, w/conflict in opengl/tests/copybits/Android.mk 2009-10-12 12:23:37 -07:00
Jason Sams
cf4f644503 am 2e9ca540: am 12bb2c4c: am fe7c2a50: Merge change I996db8da into eclair 
Merge commit '2e9ca540fc15da4363111860949136e61b816dac'

* commit '2e9ca540fc15da4363111860949136e61b816dac':
  Fix tls crash on startup if more than one RS contexts are created in one process.
 2009-10-12 11:49:48 -07:00
Josh Guilfoyle
bf7ffe9782 am 35a82b6b: am 1b7ad876: Merge change I6b51a98a into eclair-mr2 
Merge commit '35a82b6b5be55287589028e1f8874b65f50245f4'

* commit '35a82b6b5be55287589028e1f8874b65f50245f4':
  Fixed issue #4098: Ringtone#getTitle does not close its cursor.
 2009-10-12 11:48:50 -07:00
Ray Chen
9b98e49f62 am 2f2634e5: am 13ed5750: Add group id to getThumbnail and cancelThumbnailRequest API. 
Merge commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc'

* commit '2f2634e5be65c56f93d3fc3a97e25c546e3bc8bc':
  Add group id to getThumbnail and cancelThumbnailRequest API.
 2009-10-12 11:48:10 -07:00
gwang@google.com
80df8cd8df am ed2247dc: am 3e655688: am 521f4f3a: Merge change I3d6cf8aa into eclair 
Merge commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9'

* commit 'ed2247dc685233b82c7769a5e17f103c1c603ab9':
  Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
 2009-10-12 11:47:25 -07:00
Xavier Ducrohet
84436a245c am 4ab1b3a2: am 88fb78d2: am 5f9d4bae: layout lib tests cleanup 
Merge commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1'

* commit '4ab1b3a292216620cbf7cb6f424e6a159f138dd1':
  layout lib tests cleanup
 2009-10-12 11:47:14 -07:00
Xavier Ducrohet
a8ace6cbff am 66ce0f07: am c7bade2a: am 0a9d46b7: Add a test to make sure the replaced classes in layoutlib are correct. 
Merge commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090'

* commit '66ce0f07fcb79b97dc52aa0a1c5fce1565f4f090':
  Add a test to make sure the replaced classes in layoutlib are correct.
 2009-10-12 11:47:04 -07:00
Robert Greenwalt
0de99ced5b am 2a9b411d: am e8830120: am 92b5caa4: Merge change Id8df149c into eclair 
Merge commit '2a9b411d4ed60acbe089068c93850ecd049f57f2'

* commit '2a9b411d4ed60acbe089068c93850ecd049f57f2':
  Turn some logging back on in ConnectionManager
 2009-10-12 11:46:54 -07:00
Jim Miller
1c862c2978 am e15dc6e1: am ca4efac9: am f65161f1: Merge change If933b13d into eclair 
Merge commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9'

* commit 'e15dc6e19f944889a8d9f3fb97b014aa7d298de9':
  Fix for 2161835: Tweaks to rotary lock screen:
 2009-10-12 11:44:59 -07:00
Jason Sams
2249bf89d7 am c5f2aae4: am 9816a5d1: am 968a9571: Merge change I516c3191 into eclair 
Merge commit 'c5f2aae4da0a0aef635453bbd86b570e46b66bb2'

* commit 'c5f2aae4da0a0aef635453bbd86b570e46b66bb2':
  Implement data push from scripts.  Fixes the problem where apps would have to poll to monitor a scripts state.
 2009-10-12 11:44:49 -07:00
Wu-cheng Li
83a880065f am 3616d154: am 80fff7a5: am 962f2536: Merge change I547cff66 into eclair 
Merge commit '3616d15451734bd3b563d73f9c2f25c19d7df75c'

* commit '3616d15451734bd3b563d73f9c2f25c19d7df75c':
  Add zoom functions and sendCommand.
 2009-10-12 11:44:39 -07:00
Fred Quintana
d0b6760f37 am 7a5262a6: am 72fc14e8: am f83d9b3f: fix build breakage 
Merge commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b'

* commit '7a5262a620819e85cdcc6441bf0eb0b05dafe46b':
  fix build breakage
 2009-10-12 11:44:28 -07:00
Fred Quintana
e932cf997e am 11aaaa70: am 77a7bdce: am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity 
Merge commit '11aaaa70b75aa919b385289c5b06bbd20f9e424d'

* commit '11aaaa70b75aa919b385289c5b06bbd20f9e424d':
  - hide Entity and all its references
 2009-10-12 11:44:16 -07:00
Suchi Amalapurapu
e5441dd9e7 am 5a535026: am ef3c63ad: am 5163cd6d: Merge change I5be3d603 into eclair 
Merge commit '5a535026bfc1d091c0d029b21cc63f929c2def0a'

* commit '5a535026bfc1d091c0d029b21cc63f929c2def0a':
  Make sdk version and code names static finals in PackageParser.
 2009-10-12 11:44:05 -07:00
Daisuke Miyakawa
1fa3fd7d2f am 4613007b: am 629f94fa: am ccc214b2: Merge change I6a0b14bd into eclair 
Merge commit '4613007b5755ed95a3a649909b4702400863f9b4'

* commit '4613007b5755ed95a3a649909b4702400863f9b4':
  Make VCardComposer create the instance for mHandlerList.
 2009-10-12 11:41:20 -07:00
Evan Millar
a37d5e3597 am d25a60c9: am 6cd206ab: am 9c3c276a: Merge change I8333dcc4 into eclair 
Merge commit 'd25a60c95822ffa1e5d1b312791bc7ed2e2817d1'

* commit 'd25a60c95822ffa1e5d1b312791bc7ed2e2817d1':
  New section header and divider assets.
 2009-10-12 11:40:55 -07:00
Bjorn Bringert
a1a9243f04 am 66b6dc68: am 2235a020: am 030b2cf1: Merge change I76d7ba61 into eclair 
Merge commit '66b6dc68ad9aa5c38258bb84259dc23ce5acae24'

* commit '66b6dc68ad9aa5c38258bb84259dc23ce5acae24':
  Pixel tweak search dialog to match search widget
 2009-10-12 11:40:21 -07:00
Xavier Ducrohet
54f84d80ba am 3557d5bc: am 9cf2bbb0: am 841a8eea: Merge change I24895c35 into eclair 
Merge commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b'

* commit '3557d5bc9eb8ac33641430ca52d8e2121d0f1a4b':
  Reimplement all the method of Paint for layoutlib
 2009-10-12 11:40:11 -07:00
Marco Nelissen
82387365e1 am 2c3dc14a: am a97402e1: am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by 
Merge commit '2c3dc14acb7308570b9d695ba9ac904a9502b043'

* commit '2c3dc14acb7308570b9d695ba9ac904a9502b043':
  Music visualizer support hack.
 2009-10-12 11:40:01 -07:00
Nick Pelly
da0703e190 am 3f25987d: am d4cf13a6: am 52cde727: Fix docs builds. 
Merge commit '3f25987d331b1d3585e32131b05351b86ec14b70'

* commit '3f25987d331b1d3585e32131b05351b86ec14b70':
  Fix docs builds.
 2009-10-12 11:38:48 -07:00
Nick Pelly
4c08b8b5b8 am a1cb6a64: am 460965c2: am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record. 
Merge commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09'

* commit 'a1cb6a64c6710d46cc8673bc17db3bdb5c7bbc09':
  Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
 2009-10-12 11:38:32 -07:00
Mike Lockwood
4ccbd5ade5 am 2d0dee0e: am 0daf3e91: am 7fdd67d3: Merge change I5b650a61 into eclair 
Merge commit '2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b'

* commit '2d0dee0e6ccebced9eac11dec24fbb66a1a40b2b':
  dumpstate: Emit a logcat message at beginning and end of execution.
 2009-10-12 11:37:39 -07:00
Tammo Spalink
fa7edb4843 am 7589ae77: am ef5aed64: am 5c8dba21: Merge change I61aac7b3 into eclair 
Merge commit '7589ae77224a28a2162cde74c3ae8b1d826c635c'

* commit '7589ae77224a28a2162cde74c3ae8b1d826c635c':
  Add PERIOD char to CDMA address sugar list.
 2009-10-12 11:36:48 -07:00
Fred Quintana
97c9203b41 am 70cdb4d6: am 0eb2d838: am 5fbaefc3: Merge change I4db3a5b3 into eclair 
Merge commit '70cdb4d684e2821b614562fdb868140154db0026'

* commit '70cdb4d684e2821b614562fdb868140154db0026':
  fix a javadoc build breakage
 2009-10-12 11:35:13 -07:00
Xavier Ducrohet
e229e1e801 am 636d9cd6: am 5becdc32: am a970bf52: Merge change I34f51342 into eclair 
Merge commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14'

* commit '636d9cd63b77a87e6cb627a90cc8f37e81bedb14':
  Fix the layoutlib test to run from adt-tests.
 2009-10-12 11:34:11 -07:00
Dianne Hackborn
9809d5149b am 4bc6158d: am baad552d: am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast 
Merge commit '4bc6158d6bdeff796cfd61d489c01db0d203534c'

* commit '4bc6158d6bdeff796cfd61d489c01db0d203534c':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
 2009-10-12 11:34:00 -07:00