OSDN Git Service
Hung-ying Tyan [Wed, 6 Oct 2010 01:37:14 +0000 (18:37 -0700)]
am
fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Merge commit '
fc7e7766e7d6a49d31426f821c0a56168c0d75cc' into gingerbread-plus-aosp
* commit '
fc7e7766e7d6a49d31426f821c0a56168c0d75cc':
CallManager/SipPhone: fix reject a ringing call
Hung-ying Tyan [Wed, 6 Oct 2010 01:33:22 +0000 (18:33 -0700)]
Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread
Gilles Debunne [Wed, 6 Oct 2010 01:15:12 +0000 (18:15 -0700)]
am
671b2a57: Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
Merge commit '
671b2a57bb5a2a8669d1dabe65b4080804ee350a' into gingerbread-plus-aosp
* commit '
671b2a57bb5a2a8669d1dabe65b4080804ee350a':
Fix for IndexOutOfBounds in text pasting.
Gilles Debunne [Wed, 6 Oct 2010 01:11:09 +0000 (18:11 -0700)]
Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
Eric Laurent [Wed, 6 Oct 2010 00:10:59 +0000 (17:10 -0700)]
am
37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Merge commit '
37947afe904220bdf0a1a85a22824d8619be8e36' into gingerbread-plus-aosp
* commit '
37947afe904220bdf0a1a85a22824d8619be8e36':
Fixed AudioFlinger not always pausing tracks
Eric Laurent [Wed, 6 Oct 2010 00:06:16 +0000 (17:06 -0700)]
Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread
Adam Powell [Tue, 5 Oct 2010 23:46:05 +0000 (16:46 -0700)]
am
59c4cb9e: Merge "DO NOT MERGE Fix bug
3001751 and bug
3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit '
59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp
* commit '
59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
DO NOT MERGE Fix bug
3001751 and bug
3001584 - Gingerbread API review for over-scroll
Adam Powell [Tue, 5 Oct 2010 23:39:24 +0000 (16:39 -0700)]
Merge "DO NOT MERGE Fix bug
3001751 and bug
3001584 - Gingerbread API review for over-scroll" into gingerbread
Adam Powell [Tue, 5 Oct 2010 22:49:23 +0000 (15:49 -0700)]
am
5a5fff71: Fix bug
3064143 - remove default bold on buttons
Merge commit '
5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp
* commit '
5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
Fix bug
3064143 - remove default bold on buttons
Dianne Hackborn [Tue, 5 Oct 2010 21:45:32 +0000 (14:45 -0700)]
am
930d6c3c: Merge "Fix issue #
3056500: Problem report for ASTRO" into gingerbread
Merge commit '
930d6c3cd5ad387489eb1d35a38beeafe54166b6' into gingerbread-plus-aosp
* commit '
930d6c3cd5ad387489eb1d35a38beeafe54166b6':
Fix issue #
3056500: Problem report for ASTRO
Joe Onorato [Tue, 5 Oct 2010 21:45:28 +0000 (14:45 -0700)]
am
f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread
Merge commit '
f7872780ca3dae9584251b1e3495aed12110254c' into gingerbread-plus-aosp
* commit '
f7872780ca3dae9584251b1e3495aed12110254c':
PowerManagerService needs yet another flag...
Dianne Hackborn [Tue, 5 Oct 2010 21:42:04 +0000 (14:42 -0700)]
Merge "Fix issue #
3056500: Problem report for ASTRO" into gingerbread
Joe Onorato [Tue, 5 Oct 2010 21:41:16 +0000 (14:41 -0700)]
Merge "PowerManagerService needs yet another flag..." into gingerbread
Andreas Huber [Tue, 5 Oct 2010 21:13:16 +0000 (14:13 -0700)]
am
17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Merge commit '
17bc4f65324a823598e7671256c815bf32ddcc95' into gingerbread-plus-aosp
* commit '
17bc4f65324a823598e7671256c815bf32ddcc95':
Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
Andreas Huber [Tue, 5 Oct 2010 21:09:32 +0000 (14:09 -0700)]
Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread
Kenny Root [Tue, 5 Oct 2010 21:07:29 +0000 (14:07 -0700)]
am
2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit '
2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp
* commit '
2c3360fe9c03536cbfd77267170b73c120c071ac':
Remove lingering system app native libs in /data
Kenny Root [Tue, 5 Oct 2010 21:04:26 +0000 (14:04 -0700)]
Merge "Remove lingering system app native libs in /data" into gingerbread
Jeff Brown [Tue, 5 Oct 2010 20:17:04 +0000 (13:17 -0700)]
am
78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread
Merge commit '
78d15acfb20269ce263ce19514a2c0e7a98409e2' into gingerbread-plus-aosp
* commit '
78d15acfb20269ce263ce19514a2c0e7a98409e2':
Make secure views tolerate IME overlays.
Kenny Root [Tue, 5 Oct 2010 20:13:36 +0000 (13:13 -0700)]
am
8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread
Merge commit '
8735c4cda00de26127d694bfbc81e192c4caca44' into gingerbread-plus-aosp
* commit '
8735c4cda00de26127d694bfbc81e192c4caca44':
Get correct native library path on reinstall
Dianne Hackborn [Tue, 5 Oct 2010 20:13:25 +0000 (13:13 -0700)]
am
e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread
Merge commit '
e02e41f484a115b5278dcc07f2d6c90819279800' into gingerbread-plus-aosp
* commit '
e02e41f484a115b5278dcc07f2d6c90819279800':
DO NOT MERGE: Get rid of status bar's dim during night.
Jeff Brown [Tue, 5 Oct 2010 20:06:05 +0000 (13:06 -0700)]
Merge "Make secure views tolerate IME overlays." into gingerbread
Mike Lockwood [Tue, 5 Oct 2010 20:00:13 +0000 (16:00 -0400)]
resolved conflicts for merge of
2f65a99f to gingerbread-plus-aosp
Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059
Kenny Root [Tue, 5 Oct 2010 19:48:46 +0000 (12:48 -0700)]
Merge "Get correct native library path on reinstall" into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 19:48:40 +0000 (12:48 -0700)]
Merge "DO NOT MERGE: Get rid of status bar's dim during night." into gingerbread
Mike Lockwood [Tue, 5 Oct 2010 19:36:34 +0000 (12:36 -0700)]
Merge changes Ic5551c94,I0207f7f7 into gingerbread
* changes:
GPS: Clean up GPS API extension initialization in JNI code.
GPS: Add support for AGpsRilInterface.
Jeff Brown [Tue, 5 Oct 2010 19:26:23 +0000 (12:26 -0700)]
Make secure views tolerate IME overlays.
Change-Id: I3cf09b9d91045f4d9c558b4aace482a7b0bbd3d8
Robert Greenwalt [Tue, 5 Oct 2010 19:24:47 +0000 (12:24 -0700)]
am
45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread
Merge commit '
45a8901dc3ae12ad818ac2afdd63fe712769cb3b' into gingerbread-plus-aosp
* commit '
45a8901dc3ae12ad818ac2afdd63fe712769cb3b':
Add supporting MCC=450(Korea)
Robert Greenwalt [Tue, 5 Oct 2010 18:46:12 +0000 (11:46 -0700)]
Merge "Add supporting MCC=450(Korea)" into gingerbread
Brett Chabot [Tue, 5 Oct 2010 18:05:37 +0000 (11:05 -0700)]
am
b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit '
b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp
* commit '
b9a40068b590b86904b40bf466571b140d0f94b4':
Failing test cleanup.
Brett Chabot [Tue, 5 Oct 2010 18:00:07 +0000 (11:00 -0700)]
Merge "Failing test cleanup." into gingerbread
Adam Powell [Tue, 5 Oct 2010 06:16:00 +0000 (23:16 -0700)]
am
abcbb1a1: Fix bug
3061544 and some clipping errors.
Merge commit '
abcbb1a1989e8c6adec607b3964dc187f5526e66' into gingerbread-plus-aosp
* commit '
abcbb1a1989e8c6adec607b3964dc187f5526e66':
Fix bug
3061544 and some clipping errors.
Hung-ying Tyan [Tue, 5 Oct 2010 06:07:43 +0000 (23:07 -0700)]
am
718e0033: Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Merge commit '
718e0033e69fa7d1db12242324ab9098ac430bf5' into gingerbread-plus-aosp
* commit '
718e0033e69fa7d1db12242324ab9098ac430bf5':
SIP: add SERVER_UNREACHABLE error code.
Hung-ying Tyan [Tue, 5 Oct 2010 06:07:39 +0000 (23:07 -0700)]
am
1862af57: Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Merge commit '
1862af57b2c5ca5387b12974e8ef661651edb97d' into gingerbread-plus-aosp
* commit '
1862af57b2c5ca5387b12974e8ef661651edb97d':
SipService: supply PendingIntent when open a profile.
Dianne Hackborn [Tue, 5 Oct 2010 06:04:53 +0000 (23:04 -0700)]
am
6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit '
6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283' into gingerbread-plus-aosp
* commit '
6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283':
Make it easier to figure out whether an app can go on sd card.
Hung-ying Tyan [Tue, 5 Oct 2010 06:03:26 +0000 (23:03 -0700)]
Merge "SIP: add SERVER_UNREACHABLE error code." into gingerbread
Hung-ying Tyan [Tue, 5 Oct 2010 06:02:55 +0000 (23:02 -0700)]
Merge "SipService: supply PendingIntent when open a profile." into gingerbread
Dianne Hackborn [Tue, 5 Oct 2010 06:00:25 +0000 (23:00 -0700)]
Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Neal Nguyen [Tue, 5 Oct 2010 04:09:52 +0000 (21:09 -0700)]
am
95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit '
95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp
* commit '
95037fb1a633f5bdeb4e0ece2d18a4974259c368':
Fixing some flakiness of some DL Manager tests.
Neal Nguyen [Tue, 5 Oct 2010 04:07:37 +0000 (21:07 -0700)]
Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Jeff Brown [Tue, 5 Oct 2010 04:05:02 +0000 (21:05 -0700)]
am
79a3981e: Fix Looper leaks in MediaRecorderStressTest.
Merge commit '
79a3981e3885b9144bb3d458682141eed7365939' into gingerbread-plus-aosp
* commit '
79a3981e3885b9144bb3d458682141eed7365939':
Fix Looper leaks in MediaRecorderStressTest.
Mathias Agopian [Tue, 5 Oct 2010 03:21:14 +0000 (20:21 -0700)]
am
f4619308: Merge "fix [
2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Merge commit '
f461930872beb4362998642c115691bdd2e94617' into gingerbread-plus-aosp
* commit '
f461930872beb4362998642c115691bdd2e94617':
fix [
2835280] Add support for cancelling buffers to ANativeWindow
Mathias Agopian [Tue, 5 Oct 2010 03:18:51 +0000 (20:18 -0700)]
am
ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit '
ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp
* commit '
ef11530874f86570aa04a10c16a416b274b3fdf5':
fix build. SurfaceView.setFrame needed to be hidden
Mathias Agopian [Tue, 5 Oct 2010 03:17:25 +0000 (20:17 -0700)]
Merge "fix [
2835280] Add support for cancelling buffers to ANativeWindow" into gingerbread
Mathias Agopian [Fri, 1 Oct 2010 23:22:41 +0000 (16:22 -0700)]
fix [
2835280] Add support for cancelling buffers to ANativeWindow
There is a new ANativeWindow::cancelBuffer() API that can be used to
cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is
returned to the list of availlable buffers. dequeue and cancel are not
mutually thread safe, they must be called from the same thread or
external synchronization must be used.
Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
Mathias Agopian [Tue, 5 Oct 2010 03:06:51 +0000 (20:06 -0700)]
am
19058877: Merge "refactored screenshot code" into gingerbread
Merge commit '
19058877df9bf94f197a72855f810f7f6bf8d068' into gingerbread-plus-aosp
* commit '
19058877df9bf94f197a72855f810f7f6bf8d068':
refactored screenshot code
Mathias Agopian [Tue, 5 Oct 2010 03:06:47 +0000 (20:06 -0700)]
am
b9aacfdf: Merge "new screencap command" into gingerbread
Merge commit '
b9aacfdfb014cc0299f7999d2a8940cd60a4cc59' into gingerbread-plus-aosp
* commit '
b9aacfdfb014cc0299f7999d2a8940cd60a4cc59':
new screencap command
Mathias Agopian [Tue, 5 Oct 2010 03:04:42 +0000 (20:04 -0700)]
Merge "refactored screenshot code" into gingerbread
Mathias Agopian [Tue, 5 Oct 2010 03:04:37 +0000 (20:04 -0700)]
Merge "new screencap command" into gingerbread
Adam Powell [Tue, 5 Oct 2010 02:59:35 +0000 (19:59 -0700)]
am
1c2911a6: Merge "Fix bug
3061769" into gingerbread
Merge commit '
1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp
* commit '
1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
Fix bug
3061769
Adam Powell [Tue, 5 Oct 2010 02:56:49 +0000 (19:56 -0700)]
Merge "Fix bug
3061769" into gingerbread
Mathias Agopian [Tue, 5 Oct 2010 02:52:41 +0000 (19:52 -0700)]
am
7e6064ad: Merge "fix [
3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Merge commit '
7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3' into gingerbread-plus-aosp
* commit '
7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3':
fix [
3008290] passion GB surface does not send surfaceChanged notification after size change.
Mathias Agopian [Tue, 5 Oct 2010 02:50:16 +0000 (19:50 -0700)]
Merge "fix [
3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Elliott Hughes [Tue, 5 Oct 2010 01:55:32 +0000 (18:55 -0700)]
am
7280f215: Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
Merge commit '
7280f2155c37b00359c3fb050e2b067dcd74db40' into gingerbread-plus-aosp
* commit '
7280f2155c37b00359c3fb050e2b067dcd74db40':
Manually revert a single-line error inserted by OpenJDK.
Elliott Hughes [Tue, 5 Oct 2010 01:51:38 +0000 (18:51 -0700)]
Merge "Manually revert a single-line error inserted by OpenJDK." into gingerbread
James Dong [Tue, 5 Oct 2010 01:39:52 +0000 (18:39 -0700)]
am
6f1c7bda: Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Merge commit '
6f1c7bda39774fe3a1febf72b03c8ad481c1ea54' into gingerbread-plus-aosp
* commit '
6f1c7bda39774fe3a1febf72b03c8ad481c1ea54':
Fixed an issue where the reserved free space in the file writer was larger than intended
James Dong [Tue, 5 Oct 2010 01:37:48 +0000 (18:37 -0700)]
Merge "Fixed an issue where the reserved free space in the file writer was larger than intended" into gingerbread
Nick Pelly [Tue, 5 Oct 2010 01:27:27 +0000 (18:27 -0700)]
am
15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '
15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp
* commit '
15f107b151deff1f25f1255bdbcb630ed576ac8d':
New API stubs: NdefMessage and NdefRecord.
Nick Pelly [Tue, 5 Oct 2010 01:21:57 +0000 (18:21 -0700)]
Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Gilles Debunne [Tue, 5 Oct 2010 01:13:34 +0000 (18:13 -0700)]
am
52810607: Revert "Restored ic_dialog_menu_generic asset."
Merge commit '
528106070b6622e82fd22783007f6dbc29b96701' into gingerbread-plus-aosp
* commit '
528106070b6622e82fd22783007f6dbc29b96701':
Revert "Restored ic_dialog_menu_generic asset."
Gilles Debunne [Tue, 5 Oct 2010 00:53:55 +0000 (17:53 -0700)]
am
e91398d1: Revert for 68833 and 68483 which introduced new assets instead of just updating.
Merge commit '
e91398d134256cf9c39677f9b1cd0279b17a6d88' into gingerbread-plus-aosp
* commit '
e91398d134256cf9c39677f9b1cd0279b17a6d88':
Revert for 68833 and 68483 which introduced new assets instead of just updating.
Mathias Agopian [Wed, 29 Sep 2010 20:02:36 +0000 (13:02 -0700)]
refactored screenshot code
the core screenshot function now can capture the screen at any lower resolution
performing bilinear filtering.
we also now have some client code to interface with the screenshot service.
it's now possible to request a screenshot at a lower resolution.
Change-Id: I33689bba98507ab928d0898b21596d0d2fe4b953
Kenny Root [Tue, 5 Oct 2010 00:12:10 +0000 (17:12 -0700)]
am
f84a5918: Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Merge commit '
f84a5918f5e0572c0280fa705970ef7459b45393' into gingerbread-plus-aosp
* commit '
f84a5918f5e0572c0280fa705970ef7459b45393':
Use pread() in ZipFileRO for Linux
Kenny Root [Tue, 5 Oct 2010 00:08:26 +0000 (17:08 -0700)]
Merge "Use pread() in ZipFileRO for Linux" into gingerbread
Gilles Debunne [Tue, 5 Oct 2010 00:03:25 +0000 (17:03 -0700)]
am
c37eac24: Restored ic_dialog_menu_generic asset.
Merge commit '
c37eac249719a8f930cb2b9d3c5bdee591018cc5' into gingerbread-plus-aosp
* commit '
c37eac249719a8f930cb2b9d3c5bdee591018cc5':
Restored ic_dialog_menu_generic asset.
Gilles Debunne [Mon, 4 Oct 2010 23:45:32 +0000 (16:45 -0700)]
am
a29643a6: Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Merge commit '
a29643a6455df7d3d615cdc45e11c437fe4b6cee' into gingerbread-plus-aosp
* commit '
a29643a6455df7d3d615cdc45e11c437fe4b6cee':
DO NOT MERGE. Select word no longer selects spaces between words.
Gilles Debunne [Mon, 4 Oct 2010 23:42:40 +0000 (16:42 -0700)]
Merge "DO NOT MERGE. Select word no longer selects spaces between words." into gingerbread
Scott Main [Mon, 4 Oct 2010 23:35:18 +0000 (16:35 -0700)]
am
c692792e: am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
c692792ead7dab0a41181f4589c1d8d249d0ad88' into gingerbread-plus-aosp
* commit '
c692792ead7dab0a41181f4589c1d8d249d0ad88':
docs: update homepage with more countries for market announcement
Scott Main [Mon, 4 Oct 2010 23:31:47 +0000 (16:31 -0700)]
am
46ffeb21: docs: update homepage with more countries for market announcement
Merge commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a' into gingerbread
* commit '
46ffeb218859a543540a70b3229a48d2d96cbb4a':
docs: update homepage with more countries for market announcement
Scott Main [Mon, 4 Oct 2010 22:49:07 +0000 (15:49 -0700)]
am
b3a5b85a: am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
b3a5b85a612703e54e631ffab5bb518eba909899' into gingerbread-plus-aosp
* commit '
b3a5b85a612703e54e631ffab5bb518eba909899':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Mon, 4 Oct 2010 22:48:59 +0000 (15:48 -0700)]
am
b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbread
Merge commit '
b99f0c7eae365f788a21944fef28de580c7f5f92' into gingerbread-plus-aosp
* commit '
b99f0c7eae365f788a21944fef28de580c7f5f92':
Resilent media time stamp adjustment
Gilles Debunne [Mon, 4 Oct 2010 22:48:54 +0000 (15:48 -0700)]
am
b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
Merge commit '
b621e2030d86356af6e8f37e9aed339a5f2ea52b' into gingerbread-plus-aosp
* commit '
b621e2030d86356af6e8f37e9aed339a5f2ea52b':
Removed icon in Alert dialog header.
Adam Powell [Mon, 4 Oct 2010 22:48:50 +0000 (15:48 -0700)]
am
368733b2: Remove overscroll_edge.png from drawable/
Merge commit '
368733b204805cfa716897b09153350a70dca3f3' into gingerbread-plus-aosp
* commit '
368733b204805cfa716897b09153350a70dca3f3':
Remove overscroll_edge.png from drawable/
Adam Powell [Mon, 4 Oct 2010 22:48:37 +0000 (15:48 -0700)]
am
103f59ba: Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Merge commit '
103f59baa7f7d03cfe22a4b07690cc809185dfe9' into gingerbread-plus-aosp
* commit '
103f59baa7f7d03cfe22a4b07690cc809185dfe9':
Fix bug
3052686 - ScrollView padding treated incorrectly
Scott Main [Mon, 4 Oct 2010 22:39:24 +0000 (15:39 -0700)]
am
6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
Merge commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread
* commit '
6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
James Dong [Mon, 4 Oct 2010 22:35:40 +0000 (15:35 -0700)]
Merge "Resilent media time stamp adjustment" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 22:34:43 +0000 (15:34 -0700)]
Merge "Removed icon in Alert dialog header." into gingerbread
Adam Powell [Mon, 4 Oct 2010 22:24:29 +0000 (15:24 -0700)]
Merge "Fix bug
3052686 - ScrollView padding treated incorrectly" into gingerbread
Kenny Root [Mon, 4 Oct 2010 21:20:14 +0000 (14:20 -0700)]
Use pread() in ZipFileRO for Linux
AssetManager instances are created by zygote and passed to all its
children so that they don't have to individually open
frameworks-res.apk. This creates a problem for determining the current
file offset when using lseek() on those files, because you can't
guarantee the cross-process locking of a mutex. Luckily, Linux
implements pread() to get around this suckiness.
The problem is that only Linux implements this, so we have to keep the
old locking for use on host builds with aapt and friends. aapt doesn't
have this same problem of sharing file descriptors across forked
processes, so we can keep the local AutoMutex to protect accesses of
those files.
Change-Id: Ibe9f11499a53fe345f50fbaea438815ec0fd363e
Dianne Hackborn [Mon, 4 Oct 2010 21:55:09 +0000 (14:55 -0700)]
am
458fc5f5: Merge "Fix issue #
3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '
458fc5f52e25d7a8b4e482010711aed66f0b4999' into gingerbread-plus-aosp
* commit '
458fc5f52e25d7a8b4e482010711aed66f0b4999':
Fix issue #
3041660: Camera image flips upside down when rotating device
Dianne Hackborn [Mon, 4 Oct 2010 21:52:12 +0000 (14:52 -0700)]
Merge "Fix issue #
3041660: Camera image flips upside down when rotating device" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 21:47:12 +0000 (14:47 -0700)]
am
33a4c772: Merge "New green in assets for battery, download, upload" into gingerbread
Merge commit '
33a4c77218e4513268be8d5ce2af6f746976706b' into gingerbread-plus-aosp
* commit '
33a4c77218e4513268be8d5ce2af6f746976706b':
New green in assets for battery, download, upload
Joe Onorato [Mon, 4 Oct 2010 21:44:40 +0000 (14:44 -0700)]
am
87efbbb5: Merge "implement the number bubbles on the status bar" into gingerbread
Merge commit '
87efbbb563ef96a74ffd2fbbe5c0865a450254df' into gingerbread-plus-aosp
* commit '
87efbbb563ef96a74ffd2fbbe5c0865a450254df':
implement the number bubbles on the status bar
Gilles Debunne [Mon, 4 Oct 2010 21:43:16 +0000 (14:43 -0700)]
Merge "New green in assets for battery, download, upload" into gingerbread
Joe Onorato [Mon, 4 Oct 2010 21:41:38 +0000 (14:41 -0700)]
Merge "implement the number bubbles on the status bar" into gingerbread
Scott Main [Mon, 4 Oct 2010 21:37:11 +0000 (14:37 -0700)]
am
ae1864c0: am
ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
Merge commit '
ae1864c0e79baae75ad25f20828349be8635d471' into gingerbread-plus-aosp
* commit '
ae1864c0e79baae75ad25f20828349be8635d471':
docs: consistency fixit for the quickview boxes in the dev guide
Scott Main [Mon, 4 Oct 2010 21:32:26 +0000 (14:32 -0700)]
am
ec80d7f3: docs: consistency fixit for the quickview boxes in the dev guide
Merge commit '
ec80d7f311b1a0899bb4caf5b380b07027e902d1' into gingerbread
* commit '
ec80d7f311b1a0899bb4caf5b380b07027e902d1':
docs: consistency fixit for the quickview boxes in the dev guide
Patrick Dubroy [Mon, 4 Oct 2010 21:25:42 +0000 (14:25 -0700)]
am
eb15ac40: Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
Merge commit '
eb15ac40ab2da2f599f2380bc7a8b00e7132a64c' into gingerbread-plus-aosp
* commit '
eb15ac40ab2da2f599f2380bc7a8b00e7132a64c':
Fix 2-pixel offset unlock jog tab
Patrick Dubroy [Mon, 4 Oct 2010 21:20:39 +0000 (14:20 -0700)]
Merge "Fix 2-pixel offset unlock jog tab" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 21:15:15 +0000 (14:15 -0700)]
am
be86b8a4: Updated quick contact assets.
Merge commit '
be86b8a4c94905e547f8ecdcd220bbe7bb249d2b' into gingerbread-plus-aosp
* commit '
be86b8a4c94905e547f8ecdcd220bbe7bb249d2b':
Updated quick contact assets.
Dianne Hackborn [Mon, 4 Oct 2010 21:03:06 +0000 (14:03 -0700)]
am
407f625a: Add new API to find out whether external storage is removable.
Merge commit '
407f625a9b8e356e765a5ec587c443af1f3aadb5' into gingerbread-plus-aosp
* commit '
407f625a9b8e356e765a5ec587c443af1f3aadb5':
Add new API to find out whether external storage is removable.
Brad Fitzpatrick [Mon, 4 Oct 2010 19:23:58 +0000 (12:23 -0700)]
am
eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread
Merge commit '
eb6e22f29ded58e7e51702c34878fd01e20ff802' into gingerbread-plus-aosp
* commit '
eb6e22f29ded58e7e51702c34878fd01e20ff802':
Document Bitmap.createScaledBitmap
Brad Fitzpatrick [Mon, 4 Oct 2010 19:21:14 +0000 (12:21 -0700)]
Merge "Document Bitmap.createScaledBitmap" into gingerbread
Adam Powell [Mon, 4 Oct 2010 19:18:44 +0000 (12:18 -0700)]
am
d29e6861: Merge "Fix bug
3058324" into gingerbread
Merge commit '
d29e6861717a4e762050eb5a30169729e205d651' into gingerbread-plus-aosp
* commit '
d29e6861717a4e762050eb5a30169729e205d651':
Fix bug
3058324
Adam Powell [Mon, 4 Oct 2010 19:15:34 +0000 (12:15 -0700)]
Merge "Fix bug
3058324" into gingerbread
Gilles Debunne [Mon, 4 Oct 2010 19:10:21 +0000 (12:10 -0700)]
am
4d3baaf5: Merge "Bug fixes in Text selection." into gingerbread
Merge commit '
4d3baaf5308ddee43c1cd742497a38806cec6320' into gingerbread-plus-aosp
* commit '
4d3baaf5308ddee43c1cd742497a38806cec6320':
Bug fixes in Text selection.
Gilles Debunne [Mon, 4 Oct 2010 19:06:10 +0000 (12:06 -0700)]
Merge "Bug fixes in Text selection." into gingerbread
Dianne Hackborn [Mon, 4 Oct 2010 19:01:08 +0000 (12:01 -0700)]
am
1073e3fa: Merge "Don\'t write settings multiple times when unmounting." into gingerbread
Merge commit '
1073e3fa72a59af15ff4243b65a789ddb61bcded' into gingerbread-plus-aosp
* commit '
1073e3fa72a59af15ff4243b65a789ddb61bcded':
Don't write settings multiple times when unmounting.
Dianne Hackborn [Mon, 4 Oct 2010 18:58:09 +0000 (11:58 -0700)]
Merge "Don't write settings multiple times when unmounting." into gingerbread
Chia-chi Yeh [Mon, 4 Oct 2010 18:53:56 +0000 (11:53 -0700)]
am
4fc04f16: Merge "RTP: Add a baseline echo suppressor." into gingerbread
Merge commit '
4fc04f160f5ad99ce618084c689b239a2644deca' into gingerbread-plus-aosp
* commit '
4fc04f160f5ad99ce618084c689b239a2644deca':
RTP: Add a baseline echo suppressor.
Chia-chi Yeh [Mon, 4 Oct 2010 18:51:45 +0000 (11:51 -0700)]
Merge "RTP: Add a baseline echo suppressor." into gingerbread
OSDN Git Service
