37510 Commits

Author SHA1 Message Date
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
Adam Powell
d94d6e7703 Fix bug 3246772 - GridView has orange focus asset in holo theme
Fix bug 3246335 - ImageButton background not properly defined for holo

Change-Id: I8c90ce680dd94c8166be401ebd49bb80a3da3976
2010-12-05 16:58:09 -08:00
Adam Powell
c6ddc8cf12 Merge "Add dividers to action bar navigation. Lighter dividers for holo themes." 2010-12-05 16:49:40 -08:00
Adam Powell
3f7f7ac30a Add dividers to action bar navigation. Lighter dividers for holo themes.
Change-Id: I879dbd815a891fe5db20678b674a9cee63a5e1ae
2010-12-05 16:44:38 -08:00
James Dong
5df53fe2f0 Remove check if the target video resolution is not supported by CameraSource
and clean up Camera is CameraSource could not created.

bug - 3254411

Change-Id: I43497c450e7007de5ce027e2912b1421119e8887
2010-12-05 16:08:30 -08:00
Nick Pelly
28e8c66d4b am d8c32332: Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread
* commit 'd8c323321c28a0a5ff70c6e0694aa822edca4005':
  Fixed technology name typo's.
  Implement historical bytes / attrib on IsoDep
  Provide system code and manufacturer code for Felica tech.
  Fixed NfcAdapter init and getTechnology().
  Secure Element access implementation
  Rough first pass at the NFC technology API.
  Revert "Merge "Remove the My Tag feature." into gingerbread"
2010-12-05 14:49:00 -08:00
Nick Pelly
d8c323321c Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread 2010-12-05 14:46:29 -08:00
Nick Pelly
16ec9c5bb5 Merge branch gingerbread-nfc into gingerbread.
Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1
Signed-off-by: Nick Pelly <npelly@google.com>
2010-12-05 14:45:29 -08:00
Dianne Hackborn
7d3fe266b1 Merge "Fix up API definitions in master." 2010-12-05 14:12:19 -08:00
James Dong
933a4bb4ff Merge "Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()" 2010-12-05 14:07:58 -08:00
Adam Powell
6bc926bbb6 Merge "Fix bug 3214215 - ListView should stay scrolled to the bottom in transcript mode after a resize" 2010-12-05 13:54:07 -08:00
Adam Powell
da13dbae6f Fix bug 3214215 - ListView should stay scrolled to the bottom in transcript mode after a resize
Change-Id: Iaccc61d9b38e7add44216f3e39b196623773af91
2010-12-05 13:47:23 -08:00
Dianne Hackborn
9d07233be5 Fix up API definitions in master.
9.xml -- the GB 2.3 API being released.
10.xml -- a place holder for the GB 2.4 API that is in progress.
11.xml -- the HC API that is in progress.

Currently 10.xml is just a copy of 9.xml, but it will get updated
as changes are made to GB.

Note there is a big unfortunate result here, that any new GB APIs
that are added need to be hand-merged to 10.xml.  Joy.

Change-Id: Id8d2ab3906ecabc968092fc1dfb568cc29efd7ff
2010-12-05 13:26:04 -08:00
Adam Powell
a7a27b3c99 Merge "Add public style for tabby-looking views" 2010-12-05 13:13:19 -08:00
Dianne Hackborn
381fe35964 Merge "Update 9.xml to match the real GB 9.xml." 2010-12-05 13:11:57 -08:00
Dianne Hackborn
0bb0b737a8 Update 9.xml to match the real GB 9.xml.
Except for the stuff that shouldn't.

Change-Id: Idf73fd8526ed34d41e45a2cebcbae07b80ad6bb7
2010-12-05 13:08:53 -08:00
Adam Powell
4002cb21ea Add public style for tabby-looking views
Change-Id: I5b2339aff668f4db4569e55cd29328032ca03385
2010-12-05 13:07:27 -08:00
Adam Powell
8c345d8316 Integrate new holo button assets; update action bar tab styles
Change-Id: I9e16b08f507cf176f57568d8cc88a913aa08fcce
2010-12-05 12:17:29 -08:00
Bryan Mawhinney
8ea061bcdd Prevent message overrun in LocklessCommandFifo.
The previous logic in makeSpace and makeSpaceNonBlocking
was incorrect (probably a typo).  We shouldn't loop if
looping will overwrite unread messages, or if we would
make the buffer appear empty (mPut == mGet).

Change-Id: Iabc82ca94a585a7041069db97cbed7709f2d388f
2010-12-05 17:21:07 +00:00
Irfan Sheriff
18cbfecd8a am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
  DO NOT MERGE Avoid nullifying dhcp target
2010-12-04 23:45:18 -08:00
Kenny Root
aa183e2c9a Add measurement API to DefaultContainerService
System applications that don't have "media_rw" access need some way to
measure the size of directories on the SD card and other internal media.
Add this API to DefaultContainerService so they can simply bind to the
service and make an RPC.

Bug: 3203974
Change-Id: I4e1bcd7a1b702b156c011ecc04f6915022cb258a
2010-12-04 08:29:23 -08:00
Adam Powell
d8b3f2e8ee Action mode animations
Change-Id: I132791217a38257e4fe730f2dd364cf48069c75d
2010-12-03 20:30:52 -08:00
Yu Shan Emily Lau
e8f317d32c Suppress the unsupported camera recording size (ie QVGA and SQVGA)
Change-Id: I34b6433f0aae4a117b2467069523a62e44bf9bbe
2010-12-03 19:32:25 -08:00