Jason Chen
cd157610d9
Merge "resolved conflicts from merge of c3b112ba to master"
2010-11-05 20:25:05 -07:00
Jason Chen
b3438770a3
resolved conflicts from merge of c3b112ba to master
...
Change-Id: I76a5f88849ab617af3316d63378bf3296256e8e1
2010-11-05 20:21:29 -07:00
Adam Powell
c65dad2800
Merge "Fix bug 3067895 - Popup menus clip to container windows"
2010-11-05 20:17:01 -07:00
Adam Powell
ac19cbf7ac
Merge "Fixed several dialog theming issues"
2010-11-05 20:16:05 -07:00
Gil Dobjanschi
87fd9cf905
Merge "Added an export method without codec parameters."
2010-11-05 17:39:04 -07:00
James Dong
dca7b6fbd0
Merge "Rotation support" into gingerbread
2010-11-05 16:58:51 -07:00
James Dong
29bdd6749b
Merge "Add a new public API to support recording rotated videos" into gingerbread
2010-11-05 16:58:33 -07:00
Scott Main
56cf5dfa73
Merge "docs: update homepage for GB" into gingerbread
2010-11-05 15:02:39 -07:00
Jeff Brown
306ae8b888
Merge "Rename the locked meta key constants for clarity."
2010-11-05 15:01:43 -07:00
Vasu Nori
0b80a4c2a3
Merge "fix broken build"
2010-11-05 14:49:37 -07:00
Mike Lockwood
2b02ada78d
Merge "MediaScanner: Fix mismatch between internal and external file paths."
2010-11-05 14:32:33 -07:00
Gilles Debunne
0c833aed62
Merge "Revert "Rationalized the single/multiple line initialization in TextViews.""
2010-11-05 14:21:28 -07:00
Dianne Hackborn
18a9342d12
Merge "Fix issue #3163426 : Screen corruption when using the watermark feature"
2010-11-05 14:06:59 -07:00
Jean-Baptiste Queru
2148da1c5d
am 5580e44c: Merge "Support changing style parent in overlays"
...
* commit '5580e44c250944f5cd011b2682eea5cc2de9706c':
Support changing style parent in overlays
2010-11-05 14:05:41 -07:00
Kenny Root
816ae9e6d1
am 70fc04c8: Reorganize PackageManager dump to avoid NPE
...
* commit '70fc04c84db8f99ac2ac60fd9719b91057aacc9b':
Reorganize PackageManager dump to avoid NPE
2010-11-05 13:58:20 -07:00
Robert Ly
0d09a904f0
am 47e43feb: Doc change: Proguard tool
...
* commit '47e43febdd8ba83c333c9c98ca6a8c0bda421305':
Doc change: Proguard tool
2010-11-05 13:58:12 -07:00
Hiroshi Lockheimer
ac82c74b9e
am ce22d608: Merge "allow all 4 orientations" into gingerbread
...
* commit 'ce22d608733953e367a590efd9c7656a68ffc24d':
allow all 4 orientations
2010-11-05 13:58:04 -07:00
Scott Main
ca95e47464
am 4ebbfa8a: Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread
...
* commit '4ebbfa8a44da790eb13e7e88314bd0a648f8b891':
Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating.
2010-11-05 13:57:52 -07:00
Scott Main
cde7d40ce0
am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread
...
* commit '46151652b8dc562f4a3332e1d12fa799e3638ea8':
fix xlarge support in aapt for gingerbread
2010-11-05 13:57:41 -07:00
Scott Main
6601c3a8ce
am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it\'s only for system apps bug: 3128020
...
* commit '6e88c84cbe0a07cb8c7b9ea23d1434bcf2e2a457':
docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it's only for system apps bug: 3128020
2010-11-05 13:57:31 -07:00
Daniel Sandler
ea0fcda8eb
Merge "Show date in system bar."
2010-11-05 13:32:33 -07:00
Jeff Brown
d4ecee9313
Rename the locked meta key constants for clarity.
...
Also added some tests for LED setting.
Change-Id: I3fd86322afd07ae8de52d1ccbc2fae2c6d586641
2010-11-05 13:27:35 -07:00
Dan Bornstein
283397c469
am 10a43393: am 265acc50: am 05cc2d63: (-s ours) This class no longer exists.
...
* commit '10a433937895bff0d84f439a20a36fff97651cfd':
This class no longer exists.
2010-11-05 13:12:53 -07:00
Dan Bornstein
71a3c6efd8
am 73cd0c39: am 7dbeb24a: This class no longer exists.
...
* commit '73cd0c39bb1289704df3f3266ecedd3ed561d48c':
This class no longer exists.
2010-11-05 13:12:48 -07:00
Jim Miller
3feb4be833
Merge "Fix 3165868: Fix stall in state machine logic in WaveView"
2010-11-05 13:07:45 -07:00
shared_user android-merger-prebuild
c10d45c868
Merge commit '5de6d7a162f7b207e48a9078b9d0fe2700044976'
2010-11-05 13:03:37 -07:00
Dianne Hackborn
76c5fcd809
Merge "Adjust window animations to better match UX spec."
2010-11-05 12:52:19 -07:00
Vasu Nori
3e0381300b
Merge "Let cachefull-warning be under SQLiteDebug.DEBUG_SQL_CACHE flag"
2010-11-05 12:11:57 -07:00
Daniel Sandler
2bcdc0e294
Merge "Restore user-accessible lights-out control."
2010-11-05 12:11:48 -07:00
Adam Powell
ad39ad2b23
Merge "Fix bug 3167945 - list selection mode should persist across rotations"
2010-11-05 19:03:24 +00:00
Romain Guy
a1a131f668
Merge "Fix documentation HTML."
2010-11-05 18:58:21 +00:00
Amith Yamasani
acb9fad6c6
Merge "Adjust default screen timeout."
2010-11-05 18:26:27 +00:00
James Dong
e80fa29188
Merge "Use meta data in the media recording framework"
2010-11-05 18:18:30 +00:00
Vasu Nori
ed935d5917
Merge "address couple of review comments"
2010-11-05 18:12:04 +00:00
Gloria Wang
304c406266
Merge "Add support for WV DRM"
2010-11-05 17:45:26 +00:00
Daniel Sandler
5b31c138a7
Merge "Rotation lock bugfix."
2010-11-05 17:41:35 +00:00
Gilles Debunne
4b997c60be
Merge "Created missing assets by up/down scaling the one in other dpi"
2010-11-05 16:51:18 +00:00
Gilles Debunne
184de44c61
Merge "Created missing assets by up/down scaling the one in other dpi"
2010-11-05 16:51:01 +00:00
Jean-Baptiste Queru
22285363d9
Merge db2403ff from open-source master
...
Change-Id: I90dfa2f37db901b62690b6becbf5d0d91468672c
2010-11-05 07:53:24 -07:00
Ben Murdoch
575c297742
Merge "Work around race condition in CallBackProxy."
2010-11-05 10:12:21 +00:00
Hiroshi Lockheimer
b307b2386b
Merge "allow all 4 orientations" into gingerbread
2010-11-05 05:21:00 +00:00
Scott Main
b9539d6dd0
Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread
2010-11-04 19:27:50 -07:00
Scott Main
c08b653546
Merge "fix xlarge support in aapt for gingerbread" into gingerbread
2010-11-04 18:56:47 -07:00
Vasu Nori
d8cc08dc41
Merge "add API to return Uri for the given downloaded file id & get mimetype"
2010-11-04 18:51:03 -07:00
Shimeng (Simon) Wang
acc3232fb9
Merge "Use minPrefWidth instead of viewsize.x."
2010-11-04 18:22:28 -07:00
Jason Sams
5e57e08ceb
Merge "More RS exceptions cleanup. Remove some dead code."
2010-11-04 18:21:45 -07:00
Gilles Debunne
8348f5f67f
Merge "Assets remove from bare drawable-xlarge directory."
2010-11-04 18:11:14 -07:00
Irfan Sheriff
4cb6ceca98
Merge "Initiate wake up scan only in a disconnected state"
2010-11-04 18:08:36 -07:00
Elliott Hughes
a692894ea1
Merge "Use InetAddress.isNumeric."
2010-11-04 17:50:15 -07:00
Dianne Hackborn
499fba9ebf
Merge "Rough cut at new window animations."
2010-11-04 17:32:07 -07:00
