36572 Commits

Author SHA1 Message Date
Xavier Ducrohet
9223b6737c Layoutlib: support for editing embedded layouts.
When Resources.getLayout(int) is called to return a parser
for an embedded layout, this queries the current parser for
a custom parser (Eclipse will provide one on top of the current
XML model being edited)

Change-Id: Ia9e837358f67daed0a835e1b3f4f50c0516ceee9
2010-11-19 16:17:27 -08:00
Xavier Ducrohet
7370ab5cdb Merge "LayoutLib: use the new expand API." 2010-11-19 14:33:58 -08:00
Xavier Ducrohet
fb25cae191 LayoutLib: use the new expand API.
Change-Id: I248de70ebe97aa6fb1cbcb5b6572a4a46c5ca1ba
2010-11-19 14:27:37 -08:00
Jeff Brown
8d7572009d Merge "Fix SDK build on Windows due to use of mmap." 2010-11-19 13:57:34 -08:00
Jeff Brown
a6210d061b Fix SDK build on Windows due to use of mmap.
Change-Id: Id4bd9a6f932285c93c5853e540efc20b99876564
2010-11-19 13:52:19 -08:00
Gilles Debunne
77b25a34a2 Keyboard is not displayed when selecting read-only text.
Change-Id: Id8d1fb7ebd85a36a1e587b4e2bbbabf82aa1bdd7
2010-11-19 13:31:45 -08:00
Xavier Ducrohet
7ffd0871e6 Merge "LayoutLib: fix some tests" 2010-11-19 12:59:29 -08:00
Xavier Ducrohet
d73868859b LayoutLib: fix some tests
Change-Id: Iacd641e2fac663ff12fe2a08ba093c4eaa2e8862
2010-11-19 12:53:20 -08:00
Mike Lockwood
04ee03d593 Merge "CameraBrowser improvements:" 2010-11-19 12:31:00 -08:00
Mike Lockwood
1d5dedc9e4 CameraBrowser improvements:
Replace menu for importing and deleting files with buttons.

Automatically close activities when camera is disconnected.

Change-Id: I88351e7c337c796057ce3f7da46fc287305f2220
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 15:28:36 -05:00
Brad Fitzpatrick
7afe176a22 Merge "Fix AbsListView StrictMode.Span end point on flings." 2010-11-19 12:08:34 -08:00
Brad Fitzpatrick
5e9d94505b Fix AbsListView StrictMode.Span end point on flings.
Noticed after logs showed a ton of false positives, I went back and
looked at the history.  During the review of the previous CL, I
accidentally moved the finish() of the fling animation tracking inside
the PROFILE_FLINGING block, which is normally off.

Re-tested this CL with StrictMode debugging enabled and it now always
propertly resets to 0 animations in flight when no animations are
running.

Change-Id: Ie9746df36e2ec3f82679b20e91e3d93c05b863d4
2010-11-19 12:03:22 -08:00
Daniel Sandler
030824eef9 Merge "Improve hide/show animations in status bar." 2010-11-19 11:54:35 -08:00
Daniel Sandler
b96069936c Improve hide/show animations in status bar.
This cleans up the lights out experience so you can clearly
see that the "shadows" along the bottom of the bar
correspond to invisible (but still available) UI elements.

Bug: 3203171
Change-Id: I635394d625bf97bbbe7260c1ae9320b616ea7aec
2010-11-19 14:47:59 -05:00
Xavier Ducrohet
b389866d59 Merge "Layoutlib: support viewkey in include nodes." 2010-11-19 11:21:01 -08:00
Android Git Automerger
c3e1770ff3 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2010-11-19 11:10:11 -08:00
Brad Fitzpatrick
de8da848cd Merge "StrictMode: use Log.isLoggable" 2010-11-19 11:07:47 -08:00
Gilles Debunne
a944828d3b Merge "Clean-up in StaticLayout" 2010-11-19 11:07:15 -08:00
Gilles Debunne
6611147383 Clean-up in StaticLayout
Change-Id: I81ac5d8bef7ce8f4f65e3a8c7da8393ce0a87558
2010-11-19 11:04:37 -08:00
Mike Lockwood
76151f2505 Merge "PTP: Fix permissions problems with files imported via PTP" 2010-11-19 10:58:47 -08:00
Charles Chen
6e050f79f8 Merge "Removing logs of text that is being spoken." 2010-11-19 10:56:45 -08:00
Dirk Dougherty
fb77461234 am 00f502a3: am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '00f502a38cc4d6e2278f962b04308e6590dba36b':
  Doc change: update media formats table.
2010-11-19 10:56:26 -08:00
Mike Lockwood
929b3da2fc PTP: Fix permissions problems with files imported via PTP
Change-Id: I630a89c67e5b3d6d0c29e6c257f84e1909fa4de2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 13:55:22 -05:00
Dirk Dougherty
00f502a38c am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
  Doc change: update media formats table.
2010-11-19 10:53:20 -08:00
Charles Chen
a19ac0f639 Removing logs of text that is being spoken.
Change-Id: I12624e51eb093b6ee464fc11275046a9e5100925
2010-11-19 10:50:03 -08:00
Dirk Dougherty
0e29064d1c Merge "Doc change: update media formats table." into gingerbread 2010-11-19 10:47:10 -08:00
Robert Greenwalt
44138f15ce Merge "Notify all VMs when proxy changes." 2010-11-19 10:34:17 -08:00
Andreas Huber
978ba93842 Merge "Fix an artifact of going from off_t to off64_t" 2010-11-19 10:31:50 -08:00
Brad Fitzpatrick
33710fc4a9 am 096c4c44: am 251384a7: Merge "Improve performance when getting styled string."
* commit '096c4c448d8110c21108f2db4a19a85099e78557':
  Improve performance when getting styled string.
2010-11-19 10:27:56 -08:00
Jean-Baptiste Queru
95fcd9e486 am f69f356e: am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* inste
* commit 'f69f356ebaf33aa150817c44ee2bd781f24e4e71':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:27:51 -08:00
Brad Fitzpatrick
096c4c448d am 251384a7: Merge "Improve performance when getting styled string."
* commit '251384a7595022ddbc53f4ab0fa386f9c040f1f5':
  Improve performance when getting styled string.
2010-11-19 10:25:09 -08:00
Jean-Baptiste Queru
f69f356eba am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*"
* commit '14ac9546367d4df37eead55f6762b944b49f33b2':
  build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
2010-11-19 10:24:51 -08:00
Robert Greenwalt
434203a277 Notify all VMs when proxy changes.
bug:2700664
Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87
2010-11-19 10:24:30 -08:00
Scott Main
44868fdbb0 Merge "docs: de-'new' samples and tutorials" 2010-11-19 10:23:29 -08:00
Mike Lockwood
ec99f45fc5 Merge "Remove command line mtp host tool" 2010-11-19 10:22:09 -08:00
Scott Main
183ecbc229 docs: de-'new' samples and tutorials
Change-Id: I49cbabcb1f3a915259588bc98b05a9d702f5eb2d
2010-11-19 10:20:45 -08:00
Irfan Sheriff
7c55c74f52 Merge "Split SupplicantStateTracker and refactor" 2010-11-19 10:18:29 -08:00
Andreas Huber
783f68398b Fix an artifact of going from off_t to off64_t
Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
2010-11-19 10:08:23 -08:00
Andreas Huber
5af53d4363 Merge "Squashed commit of the following:" 2010-11-19 10:07:28 -08:00
Andreas Huber
61c79b6df9 Squashed commit of the following:
commit 610ed879d57785cb0457f7f127889496d325f732
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 09:28:52 2010 -0800

    HTTP header keys are to be treated case insensitive.

    Change-Id: I9690880528a6b0f611958de7996c2753948a03c3

commit 554a2499a293d8d53907d01d972a9cfe9b92738e
Author: Andreas Huber <andih@google.com>
Date:   Fri Nov 19 09:22:45 2010 -0800

    Remove one more legacy "string" implementation.

    Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b

Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
2010-11-19 09:36:13 -08:00
Mike Lockwood
49fd5d9957 Remove command line mtp host tool
I don't need this any more, and don't have time to finish nor maintain it.

Change-Id: I35c5d003e1ad163d429832eb1d0c8d880058c7f1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 12:24:03 -05:00
Kenny Root
9c950b41c5 Merge "Use different version of CLDR data in DatePicker" 2010-11-19 09:11:42 -08:00
Scott Main
92d735ac4f Merge "new docs for fragments" 2010-11-19 09:09:33 -08:00
Amith Yamasani
65340f1c41 Merge "Update screen timeout again." 2010-11-19 08:47:36 -08:00
Mike Lockwood
cc34eed58d Merge "PTP: Improve performance and reliability of file importing" 2010-11-19 08:33:21 -08:00
Mike Lockwood
954c267725 PTP: Improve performance and reliability of file importing
Now the file copy is done completely within the media process
rather than pushing data to the client via ContProvider.openFile().

File system writes are now interleaved with USB reads, which allows us
to copy the data faster and prevents the camera from timing out during transfer.

File is automatically inserted in the media provider after a successful import
and a Uri is returned to the client.

BUG: 2994234

Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 11:30:10 -05:00
Brad Fitzpatrick
251384a759 Merge "Improve performance when getting styled string." 2010-11-19 07:41:39 -08:00
Kristian Monsen
9803d7f870 Merge "Find mime from file extension if the mime is empty" 2010-11-19 06:58:01 -08:00
Kristian Monsen
9d005a1039 Find mime from file extension if the mime is empty
Fix for bug 3170039

Change-Id: I6d32ae157ec276575aad8fbcd73f02c48fe219d0
2010-11-19 14:53:44 +00:00
Jesse Wilson
a8bbc11afc Merge "Decode JSON literal types eagerly and with our own decoder." 2010-11-18 23:09:44 -08:00