James Dong
0efe974ee6
Merge "Remove check if the target video resolution is not supported by CameraSource and clean up Camera is CameraSource could not created."
2010-12-06 14:18:18 -08:00
Jean-Baptiste Queru
50a2a8765a
Merge from gingerbread-plus-aosp
...
Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0
2010-12-06 14:08:53 -08:00
Gilles Debunne
9df964fa3f
Merge "Moved Paste popup window up in TextView"
2010-12-06 13:57:47 -08:00
Jean-Baptiste Queru
465e88eb00
am 1ee2394e: am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1ee2394edd4b90111f8174862c7c0f435e1a3634':
Changing connect and response timeout.
2010-12-06 13:46:19 -08:00
Jean-Baptiste Queru
1ee2394edd
am 1d67fa5b: Merge "Changing connect and response timeout."
...
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
Changing connect and response timeout.
2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
1d67fa5b11
Merge "Changing connect and response timeout."
2010-12-06 13:39:19 -08:00
Irfan Sheriff
268d6afd8f
Merge "Update scan results when frequency band is set"
2010-12-06 12:47:31 -08:00
Gilles Debunne
1cafde04c5
Moved Paste popup window up in TextView
...
Bug 3228601
A tap on the insertion handle displays the paste popup immediately.
Tapping again hides the popup.
Bug 3248651
Change-Id: I5a501b3ebe36e23cbbf0f1b3d588884c6ecd1d56
2010-12-06 12:37:24 -08:00
Irfan Sheriff
cf34f47edd
Update scan results when frequency band is set
...
Change-Id: I4864b66f96744682a0de274fd49cca035ffc5d3c
2010-12-06 12:07:36 -08:00
Nick Pelly
4704982960
am cbf4e352: am 3d524e56: Merge gingerbread-nfc into gingerbread
...
* commit 'cbf4e3525be80607c4d68630faf927ce6a717f72':
First implementation of MifareUltralight
2010-12-06 11:55:08 -08:00
Nick Pelly
089c3c7c0b
resolved conflicts for merge of 28e8c66d to master
...
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
2010-12-06 11:50:47 -08:00
Guang Zhu
38dab454d1
Merge "disable HW acceleration"
2010-12-06 11:36:54 -08:00
Guang Zhu
b05deade05
disable HW acceleration
...
currently DRT will block upon launch if HW acceleration is enabled. see
b/3255765.
Change-Id: I19f2e6a6673a0284fd4916370b06aa80e04df4d2
2010-12-06 11:34:14 -08:00
Xavier Ducrohet
864f33a9f8
Merge "LayoutLib: Update font object when text info changes in paint delegate"
2010-12-06 11:32:43 -08:00
Robert Greenwalt
a2e1339241
Make Proxy change broadcast sticky
...
Makes it easier for apps who care. Includes the current values.
Change-Id: I5f1d3589a036ebc9910281f97d4780ecda2829f2
2010-12-06 11:29:17 -08:00
Guang Zhu
afeffb744f
Merge "change how assets are copied out of apk"
2010-12-06 11:28:49 -08:00
Guang Zhu
0006952a8d
change how assets are copied out of apk
...
Currently test code use getActivity to get DRT's assets. However
the side effect is that this will actually launch the activity.
This is not affecting any tests yet, however there are cleaner
ways to do this. The instrumentation framework provides a
getTargetContext call which will give access to app under test's
context, and therefore granting access to its assets.
Change-Id: I0560b0fa5681f80bcb9296beec3fd0549c40cc8e
2010-12-06 11:24:01 -08:00
Daniel Sandler
2ee1856f81
Merge "Hide navigation buttons and clock on lockscreen."
2010-12-06 11:15:45 -08:00
Xavier Ducrohet
b5ddf041d6
LayoutLib: Update font object when text info changes in paint delegate
...
Change-Id: I6ff7e1ec4513918256aee99acc5ea298a5fdb8a8
2010-12-06 11:12:47 -08:00
Jean-Baptiste Queru
62f6e1d883
am 005dd44b: am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '005dd44b756ccd5812ac55f07f93e3e16ce2be0b':
NumberPicker: Set formatter local value to US.
2010-12-06 11:05:47 -08:00
Stephen Hines
d4aa7d22f8
Stop using anonymous structs in RS.
...
Change-Id: I90344683939f2934f841031fd5339dbe91cc9e05
2010-12-06 11:04:40 -08:00
Jean-Baptiste Queru
005dd44b75
am 864b1e00: Merge "NumberPicker: Set formatter local value to US."
...
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
NumberPicker: Set formatter local value to US.
2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
864b1e007d
Merge "NumberPicker: Set formatter local value to US."
2010-12-06 10:57:04 -08:00
Irfan Sheriff
02047f7e88
am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
...
* commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
DO NOT MERGE Avoid nullifying dhcp target
2010-12-06 10:42:58 -08:00
Xavier Ducrohet
5b44aece8c
Merge "LayoutLib: Fix logging."
2010-12-06 10:40:38 -08:00
Andy Stadler
d752b66a33
Merge "Fix notification/builder defaults"
2010-12-06 10:38:04 -08:00
John Wang
536da84f41
Merge "Block incoming calls for non-voice-device."
2010-12-06 10:29:49 -08:00
John Wang
d6c3838672
Block incoming calls for non-voice-device.
...
For bug 3038102.
Non-voice capable means that this device doesn't support circuit-switched
phone calls over the telephony network. It blocks the new ringing
notification at PhoneBase level.
Change-Id: Ibef28dadae222c7ad169ee59e5c11a2c93e60e93
2010-12-06 10:25:52 -08:00
Gilles Debunne
cb60e2acf6
Merge "Made TextView use the new localState API for drag info"
2010-12-06 10:22:12 -08:00
Kenny Root
0d7128048e
Merge "Add measurement API to DefaultContainerService"
2010-12-06 10:21:47 -08:00
Irfan Sheriff
efd804b017
Merge "Hold network hand-off wakelock only when connected"
2010-12-06 10:17:57 -08:00
Yu Shan Emily Lau
28bec9ebce
Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)"
2010-12-06 10:14:16 -08:00
Xavier Ducrohet
168677c9e2
LayoutLib: Fix logging.
...
- Use the new logging API
- remove log object reference everywhere but in Bridge
- all logging code accesses Bridge.getLog()
- prepareScene sets the current scene log object in Bridge.
Change-Id: Ib0517ccd6454c4baf218b6baa978a126f91671e7
2010-12-06 10:11:44 -08:00
Fred Quintana
384977fcea
Merge "add caching to the AccountManagerService"
2010-12-06 09:55:54 -08:00
Robert Greenwalt
81b2d07596
Merge "Don't clobber the net hostname if it's already set."
2010-12-06 09:54:16 -08:00
Robert Greenwalt
733c62909c
Don't clobber the net hostname if it's already set.
...
Be a good citizen.
Change-Id: Ic58aeab013e2ff34201be71e01e399390edbbb5f
2010-12-06 09:47:31 -08:00
Andreas Huber
b5590846c0
Squashed commit of the following:
...
commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:26:12 2010 -0800
Remove obsolete code from the cached data source.
Change-Id: I794b986ac8977cbc834dff189221a636ba564e36
commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 15:23:13 2010 -0800
LiveSource is dead, long live LiveSession.
Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66
commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 12:49:31 2010 -0800
Respect explicitly signalled discontinuities.
Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271
commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 11:45:57 2010 -0800
Better protection against syncword emulation in AAC ADTS content.
Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719
commit fe765766582efcc350aed01135ea603576adccf6
Author: Andreas Huber <andih@google.com>
Date: Fri Dec 3 09:15:59 2010 -0800
New implementation of http live driving code.
Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737
Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
2010-12-06 08:28:36 -08:00
Iain Merrick
768ec6f2be
Merge "Call flushCookieStore() from CookieSyncManager."
2010-12-06 05:40:48 -08:00
Iain Merrick
99f39771ab
Call flushCookieStore() from CookieSyncManager.
...
I previously tried to make this a new public API, but I realised
it should actually hang off the existing code in CookieSyncManager.
Change-Id: Ic44334008266bad5ba1245cf674350a4c10712ce
2010-12-06 13:29:42 +00:00
Ben Murdoch
961d55fe00
Prevent autofilling directly after autofilling.
...
Clear the WebTextView's data adapter after autofill fills
out the form. This ensures that the dropdown disappears.
Change-Id: I2fd1e8b5d249f6ff3943d0a0b5d2f2b55beac70a
2010-12-06 10:37:22 +00:00
Chen Libao
f04f7ae73b
NumberPicker: Set formatter local value to US.
...
As the Arabic language formatter would make number "1,2,3" to Arabic
language word means one,two,three, NumberPicker won't like to show
any thing other than numbers, add local settings to US, make the
number 1,2,3
Change-Id: If2d161ac4133f6c9c6e1ec284d6d2fbf01855fa0
2010-12-06 10:32:53 +01:00
Henrik Baard
d39fd5a97c
Changing connect and response timeout.
...
In bad network conditions and where switches often occur between 2G and
3G the timeout of 20s is too short.
Setting this timeout to 60 seconds will improve functionality in bad conditions
while it will not affect functionality in good networks. This change also aligns
the timeouts with the timeouts used by the Browser (Connection.java).
Change-Id: I0fbe3cbfe734f8d55a41bfa5d8ab6b332a19f912
2010-12-06 07:57:02 +01:00
satok
a6738744db
Merge "Fix null pointer exception"
2010-12-05 21:38:30 -08:00
satok
bd81c3fe34
Fix null pointer exception
...
Bug: 3250622
Change-Id: I0913f10c7deb984d2b1a51701dddf765a060592e
2010-12-06 14:14:50 +09:00
Jeff Hamilton
ea2837c4eb
am c1576ad6: Update the docs to clarify the ordering constraints.
...
* commit 'c1576ad627d3d2b2d3c0764c605ebbf3ddc24401':
Update the docs to clarify the ordering constraints.
2010-12-05 20:03:59 -08:00
Jason Sams
f9adf6b74f
Merge "Prevent message overrun in LocklessCommandFifo."
2010-12-05 19:54:18 -08:00
Jeff Hamilton
c1576ad627
Update the docs to clarify the ordering constraints.
...
Change-Id: Ib3932e637a675c875b9ed3482826a150b845a385
2010-12-05 21:50:29 -06:00
Adam Powell
7e06ea80f7
Fix bug 3245210 - Bad window style for action modes for light holo dialog theme
...
Also fixed some issues with the overlay action mode window styles.
Change-Id: Ie4cf43f6ccf720ef0090ca8bd667fb6d78152f93
2010-12-05 18:29:10 -08:00
Nick Pelly
cbf4e3525b
am 3d524e56: Merge gingerbread-nfc into gingerbread
...
* commit '3d524e562606e7994ede3429b37937f40f94cd41':
First implementation of MifareUltralight
2010-12-05 18:13:10 -08:00
Nick Pelly
3d524e5626
Merge gingerbread-nfc into gingerbread
2010-12-05 18:08:16 -08:00