Dianne Hackborn
fb35db7cce
am dda868cd: Merge "Keyguard sound needs to hold wake lock."
...
* commit 'dda868cd3383aecb45b42e39abfa2670101dde00':
Keyguard sound needs to hold wake lock.
2011-09-21 15:17:09 -07:00
Dianne Hackborn
dda868cd33
Merge "Keyguard sound needs to hold wake lock."
2011-09-21 15:15:18 -07:00
Wink Saville
0db163c9aa
am d30f7372: am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
...
* commit 'd30f73725bf6f7b668244a0e51245a85005c3e9f':
Reduce connectivity logging
2011-09-21 14:16:10 -07:00
Wink Saville
d30f73725b
am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
...
* commit '4aa8d943a970008915b703758743b107927d96fa':
Reduce connectivity logging
2011-09-21 14:14:28 -07:00
Wink Saville
4aa8d943a9
Merge "Reduce connectivity logging" into ics-factoryrom
2011-09-21 14:12:42 -07:00
Adam Powell
55ee8ba3c7
am 39129cc8: Merge "Fix bug 5341804 - Unable to type into the find on page CAB"
...
* commit '39129cc88496e8fae68974ac52547cdebce030ad':
Fix bug 5341804 - Unable to type into the find on page CAB
2011-09-21 14:08:38 -07:00
Adam Powell
39129cc884
Merge "Fix bug 5341804 - Unable to type into the find on page CAB"
2011-09-21 14:06:41 -07:00
Andreas Huber
e404017b23
am bfd1c9d9: Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
...
* commit 'bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23':
Support some .avi files containing H.264 video, log warnings if audio/video unsupported
2011-09-21 13:57:54 -07:00
Andreas Huber
bfd1c9d93f
Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
2011-09-21 13:56:09 -07:00
Adam Powell
2301658222
Fix bug 5341804 - Unable to type into the find on page CAB
...
Standalone action mode windows should be focusable.
Change-Id: I7ce23f1028eb0d0d36bdb287589a6018dc178580
2011-09-21 13:39:53 -07:00
Dianne Hackborn
e47e8520fa
Keyguard sound needs to hold wake lock.
...
We need to hold a wakelock while playing the keyguard lock sound,
so that it actually completes before the CPU goes to sleep.
Change-Id: I144c345383afeb911ea461b2eb17b31183b6d092
2011-09-21 13:34:33 -07:00
Andreas Huber
3001e47212
Support some .avi files containing H.264 video, log warnings if audio/video unsupported
...
Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677
related-to-bug: 5349382
2011-09-21 13:19:54 -07:00
Jack Palevich
803fa3251e
am fbc8b886: Merge "Avoid allocating temporary memory for Matrix operations."
...
* commit 'fbc8b8861ce819cdac180fdf8d9f8ce3e82f3201':
Avoid allocating temporary memory for Matrix operations.
2011-09-21 12:41:54 -07:00
Jack Palevich
fbc8b8861c
Merge "Avoid allocating temporary memory for Matrix operations."
2011-09-21 12:40:41 -07:00
Adam Cohen
d9136b33f7
am cec857d8: am 41298971: Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom
...
* commit 'cec857d85c838ed7253c64b84d5b1354be7595b1':
Fixing disappearing lock screen, issue 5319246
2011-09-21 11:22:02 -07:00
Adam Cohen
cec857d85c
am 41298971: Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom
...
* commit '41298971c774a336257fff4a97ed5d5505bbfb60':
Fixing disappearing lock screen, issue 5319246
2011-09-21 11:19:36 -07:00
Adam Cohen
41298971c7
Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom
2011-09-21 11:17:19 -07:00
Wink Saville
c9acde9aa6
Reduce connectivity logging
...
Change-Id: I5d45b8fbcd01e42df7f2b1cf02fb5b226128abb8
2011-09-21 11:05:43 -07:00
Gilles Debunne
453afc8ca3
am a80599f5: Revert "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
...
* commit 'a80599f5be394edd9f3918ba03c490850a1d9e7f':
Revert "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
2011-09-21 11:02:10 -07:00
Gilles Debunne
a80599f5be
Revert "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
...
This reverts commit 6e405f84b8d0c7c0f939bc8e9bec17e65e704a2d.
Change-Id: I9593273d414aee1f9817f84b462cf45360ff19e3
2011-09-21 10:58:03 -07:00
Glenn Kasten
435cadbca9
am faa75f61: Merge "Bug 5234242 audio continues after discontinuity"
...
* commit 'faa75f6146165016685291084ca79ddd377411b4':
Bug 5234242 audio continues after discontinuity
2011-09-21 10:54:07 -07:00
Glenn Kasten
faa75f6146
Merge "Bug 5234242 audio continues after discontinuity"
2011-09-21 10:51:43 -07:00
Glenn Kasten
cd5c896381
Bug 5234242 audio continues after discontinuity
...
Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets.
Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
2011-09-21 10:40:01 -07:00
Mike Lockwood
8e337b9a89
Merge "PhoneWindowManager: Disable boot progress dialog on headless builds" into ics-aah
2011-09-21 10:05:04 -07:00
Mike Lockwood
d7296a1bf2
PhoneWindowManager: Disable boot progress dialog on headless builds
...
Change-Id: I25958bd426eb314b6e1386243cc285bd12f8e712
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-09-21 13:03:40 -04:00
Jean-Michel Trivi
0d8fff6b4f
am eb060254: am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
...
* commit 'eb060254a0b7aa42ab05ed6539156c3084ec1908':
Bug 5045498 Keep track of RemoteControlClient play state change time
2011-09-21 09:38:53 -07:00
Jean-Michel Trivi
eb060254a0
am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
...
* commit '9c43016b52afa855156aac2dc81a2bbe1e4ab436':
Bug 5045498 Keep track of RemoteControlClient play state change time
2011-09-21 09:36:56 -07:00
Jean-Michel Trivi
9c43016b52
Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
2011-09-21 09:34:59 -07:00
Justin Ho
22141ca7e6
am 13dfa095: am 7a2063b1: Merge "New sync icon for Phone stat_sys area Bug: 5076774" into ics-factoryrom
...
* commit '13dfa095c2a62b0bece80c12300fcab3f20a2cbe':
New sync icon for Phone stat_sys area Bug: 5076774
2011-09-21 09:19:45 -07:00
Justin Ho
13dfa095c2
am 7a2063b1: Merge "New sync icon for Phone stat_sys area Bug: 5076774" into ics-factoryrom
...
* commit '7a2063b1d59dd6d7575dc91b6dd93b4a8d462b16':
New sync icon for Phone stat_sys area Bug: 5076774
2011-09-21 09:17:41 -07:00
Justin Ho
7a2063b1d5
Merge "New sync icon for Phone stat_sys area Bug: 5076774" into ics-factoryrom
2011-09-21 09:15:53 -07:00
Jason Sams
00e3abadea
am dd0ffde6: Merge "Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner."
...
* commit 'dd0ffde6f553afb9fcdbab198102df540a4470a0':
Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner.
2011-09-21 08:55:04 -07:00
Jason Sams
dd0ffde6f5
Merge "Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner."
2011-09-21 08:53:10 -07:00
Marco Nelissen
c0a2f02e9d
am 28b9a063: Merge "MediaScanner: To query row ids of music files when handling playlists."
...
* commit '28b9a063ad359d186cf69b235c5592eb308d2ac4':
MediaScanner: To query row ids of music files when handling playlists.
2011-09-21 08:51:06 -07:00
Marco Nelissen
28b9a063ad
Merge "MediaScanner: To query row ids of music files when handling playlists."
2011-09-21 08:48:46 -07:00
Justin Ho
7c66ac48c7
am f888f3ff: am 9d48b578: Merge "Fixing low battery dialog" into ics-factoryrom
...
* commit 'f888f3ffa06ea8f67dcf417e9ce446c183238b99':
Fixing low battery dialog
2011-09-21 08:04:27 -07:00
Justin Ho
f888f3ffa0
am 9d48b578: Merge "Fixing low battery dialog" into ics-factoryrom
...
* commit '9d48b578096a14441e2063c0e54dbba4340fa178':
Fixing low battery dialog
2011-09-21 08:01:18 -07:00
Justin Ho
9d48b57809
Merge "Fixing low battery dialog" into ics-factoryrom
2011-09-21 07:59:32 -07:00
The Android Open Source Project
064b7adc6e
am b26348ed: Reconcile with ics-factoryrom-release
...
* commit 'b26348ed8fb7fd25bfbb8db824c1e45c433591b3':
Fix disappearing nav icons. (DO NOT MERGE)
Stop clobbering the systemUiVisibility on navbar touch. (DO NOT MERGE)
Retain signal level even when data is offline.
Fix MENU icon weirdness. (DO NOT MERGE)
2011-09-21 06:23:08 -07:00
The Android Open Source Project
b26348ed8f
Reconcile with ics-factoryrom-release
...
Change-Id: I401a78a2216c8c4042f6f48b4e882035cbccfc82
2011-09-21 06:19:16 -07:00
Chih-Chung Chang
a5f8b2b1c0
am 73d84df8: Merge "Fix 5229466: don\'t consume pointer events outside the window"
...
* commit '73d84df819a5086cb7baa8f95872c6786c0e0df7':
Fix 5229466: don't consume pointer events outside the window
2011-09-21 02:28:25 -07:00
Chih-Chung Chang
73d84df819
Merge "Fix 5229466: don't consume pointer events outside the window"
2011-09-21 02:26:08 -07:00
Wu-cheng Li
a3a15ed804
am a08ff8f3: am 5f0ef5fb: Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
...
* commit 'a08ff8f3a74fdaff627bbe601362f67035116d85':
Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
2011-09-21 02:23:52 -07:00
Wu-cheng Li
a08ff8f3a7
am 5f0ef5fb: Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
...
* commit '5f0ef5fb0c2e65ca3d0aa4fcd2b300d4cd0a2b4b':
Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
2011-09-21 02:21:26 -07:00
Wu-cheng Li
5f0ef5fb0c
Fix jpeg callback is lost if setPreviewCallbackWithBuffer has been called.
...
mManualBufferMode is only for CAMERA_MSG_PREVIEW_FRAME. If it is
CAMERA_MSG_COMPRESSED_IMAGE, a new byte array should be allocated.
bug:5340480
Change-Id: I4f33bd6297bfd30505e0e15ae46012ea44e85962
2011-09-21 16:58:54 +08:00
Chih-Chung Chang
d1396fbc64
Fix 5229466: don't consume pointer events outside the window
...
Change-Id: Ifa3d1d5edd81346e6ca80e113f80914ee2c47055
2011-09-21 15:56:26 +08:00
Adam Cohen
51e9d5c635
Fixing disappearing lock screen, issue 5319246
...
Change-Id: Ia59ba6388775efc83aadf1e489b767be5624d385
2011-09-20 20:55:33 -07:00
The Android Automerger
31bfacd1c2
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-20 20:43:04 -07:00
Jack Palevich
cc5471c353
Avoid allocating temporary memory for Matrix operations.
...
Also fix a bug where Matrix.invertM was not returning false when the
matrix could not be inverted.
Change-Id: I68b172032093d9f257e88c802de936633bb4912c
2011-09-20 19:59:26 -07:00
Justin Ho
ba09c07360
am eb15bb31: am a2520fc1: Merge "Ensure all clock fonts match Bug: 5340112" into ics-factoryrom
...
* commit 'eb15bb31c7131c643c169d4e9d0372314dc63918':
Ensure all clock fonts match Bug: 5340112
2011-09-20 18:56:03 -07:00