Wu-cheng Li
9969af2457
am a48b70fa: Camera.open() should only return back-facing camera.
...
* commit 'a48b70fa8ff6363d1e5282be70f6be12bc0688dc':
Camera.open() should only return back-facing camera.
2010-11-08 12:19:35 -08:00
Wu-cheng Li
1c7be28971
am 17ae3597: Revert "android.hardware.Camera.open only returns back-facing camera."
...
* commit '17ae359721ba74399e785369346509b776999d1f':
Revert "android.hardware.Camera.open only returns back-facing camera."
2010-11-08 12:19:26 -08:00
Wu-cheng Li
d2cb6c2d71
am 07b88fef: android.hardware.Camera.open only returns back-facing camera.
...
* commit '07b88fefd4e6386ad3265da47d008b40e6a58891':
android.hardware.Camera.open only returns back-facing camera.
2010-11-08 12:19:15 -08:00
Andreas Huber
0b12d14602
resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
...
Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
2010-11-08 11:56:08 -08:00
Stephen Hines
a531679793
Merge "Add vector array test to RSTest."
2010-11-08 11:49:02 -08:00
Brian Carlstrom
32795e0172
Merge "Add custom CloseGuard.Reporter for StrictMode"
2010-11-08 11:10:44 -08:00
Brad Fitzpatrick
281cd1ec56
Merge "StrictMode: now in more system server threads."
2010-11-08 11:01:41 -08:00
Joe Onorato
fb68e69999
Merge "Move the volume, media, call, camera and search key handling from PhoneWindow to a new PhoneFallbackEventHandler class that is used for all windows, not just ones with decors."
2010-11-08 10:59:27 -08:00
Dianne Hackborn
828af98c21
Merge "Fixe some stuff."
2010-11-08 10:52:37 -08:00
Brian Carlstrom
15af59b84d
Merge "Delete used import"
2010-11-08 10:45:14 -08:00
Amith Yamasani
1caf16dc31
Merge "Change margins and font size for preference_child style. Missed in previous checkin."
2010-11-08 09:55:47 -08:00
James Dong
e8afc510ee
am d8166a71: (-s ours) am 1653e261: Merge "Rotation support" into gingerbread
...
* commit 'd8166a719e192a026bf25a82b8eb6212823950a3':
Rotation support
2010-11-08 09:51:30 -08:00
Wu-cheng Li
2cd7359713
Merge "Do not use CAMERA_ID_DEFAULT because it is removed."
2010-11-08 08:46:50 -08:00
Tom O'Neill
16eb906b7c
Merge "Remove inappropriate conversion of IOException to AssertionError"
2010-11-08 08:02:44 -08:00
David 'Digit' Turner
dfd0759ff6
Refresh EGL header to work with the NDK
...
This change allows to use this header with the NDK's standalone toolchain.
For the record, the NDK toolchain defines __ANDROID__ as a compiler built-in
macro, this is however not the case currently for the prebuilt binaries that
are being used by the full Android build system, which otherwise defines ANDROID.
This change allows the header to be used by all toolchains properly. Note however
that we should properly should change our toolchain and sources to provide and
rely on __ANDROID__ instead of ANDROID though.
Change-Id: Iaa1aa1146985b5f24dcf3a83d9ddb9b4b59dc328
2010-11-07 23:36:28 +01:00
James Dong
e053bf2aed
am bb97d7bb: am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread
...
* commit 'bb97d7bbf33393af842de1d8fd8512a24c73b6b3':
Add a new public API to support recording rotated videos
2010-11-06 16:25:39 -07:00
Scott Main
53d009187b
am f80403dd: am ab3d69f6: Merge "docs: update homepage for GB" into gingerbread
...
* commit 'f80403dd5903e03cb51f374d042a297c84faaec4':
docs: update homepage for GB
2010-11-06 16:25:32 -07:00
Jean-Baptiste Queru
2e1e4e8a68
am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"
...
* commit '3442611ee11b2987c83054fe3c7ed5521f27f052':
Support changing style parent in overlays
2010-11-06 16:25:03 -07:00
Kenny Root
97925cb832
am 8806fc72: am 70fc04c8: Reorganize PackageManager dump to avoid NPE
...
* commit '8806fc729b96bf806806ef8d82147d59abfc1536':
Reorganize PackageManager dump to avoid NPE
2010-11-06 16:24:57 -07:00
Robert Ly
20be1fc3a4
am a27fc901: am 47e43feb: Doc change: Proguard tool
...
* commit 'a27fc901d8543c7734f70f0ef05977dcb94671f6':
Doc change: Proguard tool
2010-11-06 16:24:52 -07:00
Hiroshi Lockheimer
d26577371c
am 01128df3: am ce22d608: Merge "allow all 4 orientations" into gingerbread
...
* commit '01128df3c442b87f601d9c13ff2ebd54b015925d':
allow all 4 orientations
2010-11-06 16:24:45 -07:00
Scott Main
a41f9fedaa
am 3de641cb: am 4ebbfa8a: Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread
...
* commit '3de641cbb9c825cef5cc29905ea88be98ac2ce4e':
Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating.
2010-11-06 16:24:35 -07:00
Scott Main
039c19a06a
am 4da6efc8: am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread
...
* commit '4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c':
fix xlarge support in aapt for gingerbread
2010-11-06 16:24:28 -07:00
Scott Main
b445b778ee
am 04856d99: am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it\'s only for system apps bug: 3128020
...
* commit '04856d99f8f353711f294254c1159461213684a5':
docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it's only for system apps bug: 3128020
2010-11-06 16:24:20 -07:00
James Dong
2bc35eb78e
am 1653e261: Merge "Rotation support" into gingerbread
...
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
Rotation support
2010-11-06 14:22:05 -07:00
James Dong
d400c5edb4
am 0467b0ab: Merge "Add a new public API to support recording rotated videos" into gingerbread
...
* commit '0467b0abfc94f959163d84eadedf6941e41c1882':
Add a new public API to support recording rotated videos
2010-11-06 14:21:53 -07:00
Scott Main
877c0ac214
am ab3d69f6: Merge "docs: update homepage for GB" into gingerbread
...
* commit 'ab3d69f6d5a9157438f86cf90449a5f5ce7e31e0':
docs: update homepage for GB
2010-11-06 14:21:23 -07:00
Joe Onorato
cc31a57ba5
Merge "Turn off the ALS when the user setting doesn't ask for automatic brightness."
2010-11-06 13:00:35 -07:00
Owen Lin
0deef6a963
Merge "Add more EXIF tags."
2010-11-06 01:20:19 -07:00
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