James Dong
04d070f293
Merge "Removed uncessary FILE structure pointer for I/O"
2010-11-19 16:49:10 -08:00
Brian Carlstrom
8c62c1d6b9
Merge "Adding CloseGuard to Animation to find forgotten animations"
2010-11-19 16:28:30 -08:00
Xavier Ducrohet
44c50b6e03
Merge "Layoutlib: support for editing embedded layouts."
2010-11-19 16:23:22 -08:00
Andy Stadler
e87efd0300
Merge "Fixes to DevicePolicyManager.setPasswordExpirationTimeout"
2010-11-19 16:22:31 -08:00
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
Brian Carlstrom
877e0b99ee
Adding CloseGuard to Animation to find forgotten animations
...
Change-Id: I90df2c8a88dd75550431b7db63242db1a1b2f16a
2010-11-19 16:16:46 -08:00
Andy Stadler
1f35d487ba
Fixes to DevicePolicyManager.setPasswordExpirationTimeout
...
* Fix permissions problem in DevicePolicyManager
* Allow short timeouts (primarily for testing)
* Remove unused debugging code
Bug: 3212583
Change-Id: I3770b1c6f090363e8e8d65db92839cd53de05c45
2010-11-19 16:08:24 -08:00
Dianne Hackborn
c642e56ec2
Merge "Goodbye title_bar_shadow."
2010-11-19 16:04:53 -08:00
Dianne Hackborn
0a3ab5d632
Goodbye title_bar_shadow.
...
May you rest in HELL.
Change-Id: I1e9e5f509a7860e4aeb4f6598b8c6551a59a8714
2010-11-19 15:59:21 -08:00
Eric Laurent
d48124e0fe
Merge "Fix issue 3157123."
2010-11-19 15:58:24 -08:00
Eric Laurent
f3d6dd0782
Fix issue 3157123.
...
Use a Mutex wherever atomic operations were used in AudioTrack,
AudioRecord, AudioFlinger and AudioEffect classes.
Change-Id: I6f55b2cabdcd93d64ef19446735b8f33720f8dbc
2010-11-19 15:49:42 -08:00
Christopher Tate
855e4c9884
Hide DragEvent pool implementation and add docs
...
Change-Id: Idaead8ab604c69d6dbc1bd5de3afa86e1fae8396
2010-11-19 15:32:09 -08:00
Mike Lockwood
c2b18f28e0
Merge "CameraBrowser: temporarily move to system partition"
2010-11-19 14:56:07 -08:00
Mike Lockwood
af8632ccb4
CameraBrowser: temporarily move to system partition
...
Change-Id: Ied871109f98bdeba7456aacefc537d70a81ee8c9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-11-19 17:53:03 -05:00
Dianne Hackborn
f9f3dc2ade
Merge "Implement issue #2367442 : Please add API for manipulating installer package names"
2010-11-19 14:38:16 -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
Dianne Hackborn
880119bf43
Implement issue #2367442 : Please add API for manipulating installer
...
package names
Change-Id: I0563e896a47ae1a6e77aebc2d624fb1bde52ffbc
2010-11-19 13:21:08 -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
James Dong
2747e0e07f
Removed uncessary FILE structure pointer for I/O
...
o also move the fd owner from caller to callee in the Writers
Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
2010-11-19 10:48:22 -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