drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,099 Commits 1 Branch 0 Tags
Commit Graph

12099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
4ec6378566 am a788f098: am 7d776dbb: am a78a9d4c: Correct non-opaque list separator assets. 
Merge commit 'a788f09894f5b2113230a9ced9105fd6ad4c9a52'

* commit 'a788f09894f5b2113230a9ced9105fd6ad4c9a52':
  Correct non-opaque list separator assets.
 2009-10-13 18:20:20 -07:00
Dan Egnor
9b2ac4f854 am eac70503: am 5c8a80b8: Merge change I4410ec8f into eclair-mr2 
Merge commit 'eac70503c27104117f42de405cd5bd73579096be'

* commit 'eac70503c27104117f42de405cd5bd73579096be':
  Framework-side DropBox service that maintains a size-bounded
 2009-10-13 18:20:11 -07:00
Jeff Sharkey
a788f09894 am 7d776dbb: am a78a9d4c: Correct non-opaque list separator assets. 
Merge commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31' into eclair-mr2-plus-aosp

* commit '7d776dbbc567e592f5e5ae5f2e24053cdce78f31':
  Correct non-opaque list separator assets.
 2009-10-13 18:14:44 -07:00
Dan Egnor
eac70503c2 am 5c8a80b8: Merge change I4410ec8f into eclair-mr2 
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp

* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
  Framework-side DropBox service that maintains a size-bounded
 2009-10-13 18:14:37 -07:00
Jeff Sharkey
7d776dbbc5 am a78a9d4c: Correct non-opaque list separator assets. 
Merge commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0' into eclair-mr2

* commit 'a78a9d4c93ecdaf787333117a7d51b6dc39ff5d0':
  Correct non-opaque list separator assets.
 2009-10-13 18:05:48 -07:00
Android (Google) Code Review
5c8a80b8fc Merge change I4410ec8f into eclair-mr2 
* changes:
  Framework-side DropBox service that maintains a size-bounded queue of data chunks (sort of a blob-oriented logcat).
 2009-10-13 21:01:26 -04:00
Dan Egnor
4410ec8f7c Framework-side DropBox service that maintains a size-bounded 
queue of data chunks (sort of a blob-oriented logcat).

In the future, this will be coupled with a revised checkin service that
would actually upload this data.
 2009-10-13 17:36:19 -07:00
Eric Fischer
214036a9df am d3ee3b7e: (-s ours) am bd6c80f6: Import revised translations. DO NOT MERGE 
Merge commit 'd3ee3b7e2be6f7231241cde0edef9ce760eed448'

* commit 'd3ee3b7e2be6f7231241cde0edef9ce760eed448':
  Import revised translations.  DO NOT MERGE
 2009-10-13 17:18:05 -07:00
Jack Palevich
2f37ac9677 am 65cc9418: am 332c7934: Merge change I69e21f5f into eclair-mr2 
Merge commit '65cc9418af489bd98f3417f165b6837656383a1c'

* commit '65cc9418af489bd98f3417f165b6837656383a1c':
  GLDual test application.
 2009-10-13 17:11:22 -07:00
Doug Zongker
33ce433ac2 am a973eaea: am b5b67779: Merge change I7fa8c508 into eclair-mr2 
Merge commit 'a973eaea4597d819671c5caab8feed442e9a1af5'

* commit 'a973eaea4597d819671c5caab8feed442e9a1af5':
  make erase-password-on-SIM-change optional
 2009-10-13 17:11:12 -07:00
Robert Greenwalt
638b1ca07c am 317d1c9e: am 770d5c4f: am 64d54042: Merge change I61c08260 into eclair 
Merge commit '317d1c9e975c729d399406ec697ce0c863826bb6'

* commit '317d1c9e975c729d399406ec697ce0c863826bb6':
  Futher reduce the logging of EriManager.
 2009-10-13 17:10:48 -07:00
Doug Zongker
98d233606a am b80d1d0c: am afbf8afa: Merge change I564b5b00 into eclair-mr2 
Merge commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a'

* commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a':
  add "junk path" -k option to aapt
 2009-10-13 17:10:01 -07:00
Ken Shirriff
d8f81c3bb7 am 947c45b2: am b10036b3: Merge change Iaa321588 into eclair-mr2 
Merge commit '947c45b29586b64c358b7824881d98faa8733ba8'

* commit '947c45b29586b64c358b7824881d98faa8733ba8':
  Add "deleted" row to Events table.
 2009-10-13 17:09:44 -07:00
Leon Scroggins
1837bfe8ad am 7fd752af: am 5a4f64fc: Merge change Id5ba82a1 into eclair-mr2 
Merge commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d'

* commit '7fd752af7507e9f3d3e28f8e646f53f16373c02d':
  Prevent getFile from copying when the file is too large.
 2009-10-13 17:09:07 -07:00
Eric Fischer
d3ee3b7e2b am bd6c80f6: Import revised translations. DO NOT MERGE 
Merge commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64' into eclair-mr2-plus-aosp

* commit 'bd6c80f689bc36523b935d84f9e5e563c2040f64':
  Import revised translations.  DO NOT MERGE
 2009-10-13 17:09:00 -07:00
Dianne Hackborn
98b23a7a82 am 80f518b7: am d34f3994: am 2a21a77d: Merge change I1369e9ab into eclair 
Merge commit '80f518b74d9ffa1e86ab8e5dc66723c0544901ca'

* commit '80f518b74d9ffa1e86ab8e5dc66723c0544901ca':
  Work on issue #2144454: Inconsistent swipes...
 2009-10-13 17:08:49 -07:00
Derek Sollenberger
6ffcd512b4 am b4b5f2af: am 14592861: Merge change I3dafca18 into eclair-mr2 
Merge commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d'

* commit 'b4b5f2af456acef83e69d4aa4b28b42a1859be7d':
  Enabling plugin surfaces to update their position in the UI.
 2009-10-13 17:08:40 -07:00
Ray Chen
7ebee2f9e7 am 34cc5292: am b65a90d7: Merge change I73b00501 into eclair-mr2 
Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5'

* commit '34cc52922d4268633b3730dfd73658be6a06a2c5':
  Check cursor and URI value for nullity to prevent NPE.
 2009-10-13 17:08:01 -07:00
Andreas Huber
c69cfdbace am 28af587a: am c642199d: Merge change Ibd7b43bb into eclair-mr2 
Merge commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3'

* commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3':
  Separated private from public header files.
 2009-10-13 17:07:48 -07:00
Andreas Huber
ee19004b46 am b7a69ce8: am fe324a61: Merge change I8d87cd98 into eclair-mr2 
Merge commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420'

* commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420':
  Fix various compiler warnings accumulated over time.
 2009-10-13 17:07:37 -07:00
Robert Greenwalt
b9f45de523 am 00f166de: am ceabc645: am 16cb04ab: Merge change If1acb2dd into eclair 
Merge commit '00f166dedca88a781e7a64c07a42451a213f04ed'

* commit '00f166dedca88a781e7a64c07a42451a213f04ed':
  Add a little logging to diagnose wifi cycle bug
 2009-10-13 17:07:01 -07:00
Dave Sparks
00454f979c am d6e86a68: am 7d4acc53: am 69e2ef47: Merge change I9f93ce61 into eclair 
Merge commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d'

* commit 'd6e86a687d57851b90d025ae33a8e4021bffe10d':
  Throttle camera preview frames to the app. Bug 2180302.
 2009-10-13 17:06:52 -07:00
Andreas Huber
5dc13b769f am 9550e289: am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code. 
Merge commit '9550e2892f88194c9abbb85616bb55db67231d6e'

* commit '9550e2892f88194c9abbb85616bb55db67231d6e':
  OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
 2009-10-13 17:06:41 -07:00
Grace Kloba
850efa869c am 4d915e00: am d5ad08bd: am 2e778c17: Merge change I124356f6 into eclair 
Merge commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4'

* commit '4d915e00dcf40143f9caf89fd8eeadd32a8cb6f4':
  Continue caching "POST" result so that we won't get
 2009-10-13 17:05:30 -07:00
Chung-yih Wang
d53564e865 am 3adcc218: am cf4f2c22: Merge change Ic6d1545d into eclair-mr2 
Merge commit '3adcc2184998a0e22df430bb75d056fbb00b6244'

* commit '3adcc2184998a0e22df430bb75d056fbb00b6244':
  Support double-quote SSID in WifiService.
 2009-10-13 17:05:20 -07:00
Andreas Huber
9f6ff40c57 am 96c1dfcc: am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag. 
Merge commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e'

* commit '96c1dfccb275b2a2cb7f7b0005cd481e8cb59f8e':
  Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
 2009-10-13 17:04:28 -07:00
Andreas Huber
0b4acfcc60 am c55bb59e: am ef703f60: Merge change I98276091 into eclair-mr2 
Merge commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7'

* commit 'c55bb59e542368500937d6737ce2ea2d3524d6d7':
  Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
 2009-10-13 17:04:19 -07:00
Daisuke Miyakawa
182983ed00 am 4fce5c81: am 7c6770c2: Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which enables vCard composer to append "TYPE=" to type param/attribute everytime possible, which should fix the issue 2180800. 
Merge commit '4fce5c81d5b166920c60d4a907e581c71c215858'

* commit '4fce5c81d5b166920c60d4a907e581c71c215858':
  Add the flag "FLAG_APPEND_TYPE_PARAM" to VCardConfig, which
 2009-10-13 17:03:53 -07:00
Daisuke Miyakawa
a54eb5cdea am 2c0fe9b0: am d48e25d4: Merge change I83b3bddf into eclair-mr2 
Merge commit '2c0fe9b0f67441c51589a8a9f674efde0c0da2ba'

* commit '2c0fe9b0f67441c51589a8a9f674efde0c0da2ba':
  Add a new TestSuites: VCardTests
 2009-10-13 17:03:34 -07:00
Libin Tang
80b9c9f4cb am 715aba5a: am edb98812: am febb94cd: Make standard roaming indicator display indications configurable 
Merge commit '715aba5a7a9970cb4413041644f002823dfbd08b'

* commit '715aba5a7a9970cb4413041644f002823dfbd08b':
  Make standard roaming indicator display indications configurable
 2009-10-13 17:03:19 -07:00
Daisuke Miyakawa
53e6809271 am 74a2d09c: am 347daf3a: Merge change I2a52a60a into eclair-mr2 
Merge commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d'

* commit '74a2d09cba89db3b404aa10d89b5139f5ff6ab5d':
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
 2009-10-13 17:02:58 -07:00
Robert Greenwalt
a8ac1997ec am e93f07c3: am 1cf6c2c3: am 6d02f3f3: Merge change I71f48a21 into eclair 
Merge commit 'e93f07c3f8148ae249292ef05d2da8ac65428950'

* commit 'e93f07c3f8148ae249292ef05d2da8ac65428950':
  Reduce the amount of EriManager Logging.
 2009-10-13 17:02:11 -07:00
Dima Zavin
3bf0a1bea8 am 0b2dd95d: am 0c559a4b: am 98b3def2: Merge change I6261ab54 into eclair 
Merge commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6'

* commit '0b2dd95d2ead61241688a121ae1c6a5092149ef6':
  Revert "egl: temporarily also include eglTerminate->eglInitialize hack for 8k"
 2009-10-13 17:02:02 -07:00
Mike Reed
3798dbb3f1 am 8547ce6a: am bd5662a1: Merge change Ifd71653f into eclair-mr2 
Merge commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c'

* commit '8547ce6adaf218ea77c3062902f0cedf0347aa9c':
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
 2009-10-13 17:01:36 -07:00
Mike Lockwood
33daa306d1 am a7cdac03: am 5ad40971: am 6abf7c8f: Merge change Iad66a274 into eclair 
Merge commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e'

* commit 'a7cdac0329d837a3f986a499f2c1a5fbe9bc8d7e':
  Fix race condition in WindowManagerService.disableKeyguard()
 2009-10-13 17:01:23 -07:00
Nick Pelly
85028842e4 am 132570cb: am 77df9d6e: am d301c904: Merge change I305c181c into eclair 
Merge commit '132570cbf4715fa13d237f1255848caf0dbd9d79'

* commit '132570cbf4715fa13d237f1255848caf0dbd9d79':
  Delay 500ms between each registering each SDP record using sdptool.
 2009-10-13 17:01:09 -07:00
Dianne Hackborn
560709bf5d am 8cbafb83: am 7fa61063: am f836acf2: Merge change I067d55ea into eclair 
Merge commit '8cbafb83b4d3eda68c9de2db359813c370d21cbe'

* commit '8cbafb83b4d3eda68c9de2db359813c370d21cbe':
  Fix issue #2179931: Power key to wake up frequently ignored when in dock app
 2009-10-13 17:00:59 -07:00
Christoffer Gurell
d6dc568b6b am 78077455: am f555bf65: Merge change I4a4323c0 into eclair-mr2 
Merge commit '78077455a89de6485f6d2223648e241ad7240ff6'

* commit '78077455a89de6485f6d2223648e241ad7240ff6':
  Fixes scroll/measure bug in EditText
 2009-10-13 17:00:49 -07:00
Patrick Scott
26e7c40cfa am 5a6d521d: am 656c037c: Fix the youtube placeholder. 
Merge commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269'

* commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269':
  Fix the youtube placeholder.
 2009-10-13 16:59:49 -07:00
Cary Clark
018c02edab am 13d5b998: am 3e88ddc5: Select plugin objects with focusCandidate 
Merge commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d'

* commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d':
  Select plugin objects with focusCandidate
 2009-10-13 16:59:39 -07:00
Zheng BaoZhong
416dd8e60a am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2 
Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'

* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
 2009-10-13 16:59:28 -07:00
Jeff Hamilton
edd3d917af am a4b0c0d0: am 5d93de73: am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such. 
Merge commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601'

* commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
 2009-10-13 16:59:15 -07:00
Fred Quintana
ee4bc47afd am 0074e8f2: am a5e44bbd: am 083a50a3: Merge change I66693ea2 into eclair 
Merge commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c'

* commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c':
  fix sync exponential backoff for expedited syncs
 2009-10-13 16:59:05 -07:00
Jack Palevich
25022e0182 am cd0d9603: am 1bb55501: Merge change I85f598e0 into eclair-mr2 
Merge commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf'

* commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf':
  Prevent transparent region from getting out of sync with Surface Flinger
 2009-10-13 16:58:56 -07:00
Dianne Hackborn
8500fb921b am 81efcdfe: am 8a98a26a: am ee110be0: Fix issue #2179891: Need to update 5.xml 
Merge commit '81efcdfee658710bd267e6f335d7cf505224492b'

* commit '81efcdfee658710bd267e6f335d7cf505224492b':
  Fix issue #2179891: Need to update 5.xml
 2009-10-13 16:58:40 -07:00
Romain Guy
2220fee45c am 27d84fb6: am ecc6f877: am 8eb955b9: Merge change I5e482bbc into eclair 
Merge commit '27d84fb6161d3c6ce6f08ef48bf4681c334bef89'

* commit '27d84fb6161d3c6ce6f08ef48bf4681c334bef89':
  Add new RenderScript sample: ImageProcessing.
 2009-10-13 16:58:28 -07:00
Eric Fischer
5684f24282 am 297c781b: (-s ours) am 8ec1ba6d: am c08efb27: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e'

* commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e':
  Import revised translations.  DO NOT MERGE
 2009-10-13 16:58:18 -07:00
Daisuke Miyakawa
27333ed424 am a9a42a67: am ca103c16: Merge change I6ce46417 into eclair-mr2 
Merge commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78'

* commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78':
  Clean-up vCard code.
 2009-10-13 16:53:00 -07:00
Grace Kloba
1cdbf0f210 am 947a9157: am 94ab3b6d: Expose WebViewClient of WebView. 
Merge commit '947a915743c9ece5dfb7e39e585d9ff372e57244'

* commit '947a915743c9ece5dfb7e39e585d9ff372e57244':
  Expose WebViewClient of WebView.
 2009-10-13 16:52:38 -07:00
Leon Scroggins
e4fc845754 am b3e3352f: am 70ca3c25: File upload. 
Merge commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a'

* commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a':
  File upload.
 2009-10-13 16:51:00 -07:00