Mike LeBeau
426f9a6ed6
Merge "Use the new RecognitionService.SERVICE_INTERFACE instead of RecognizerIntent.ACTION_RECOGNIZE_SPEECH when finding a voice recognition service."
2010-02-11 16:25:52 -08:00
Mathias Agopian
5034b2865e
Merge "RenderScript should not depend on libsurfaceflinger_client.so"
2010-02-11 15:24:01 -08:00
Marco Nelissen
a011e44b93
Merge "Fix simulator build."
2010-02-11 14:42:01 -08:00
Marco Nelissen
4cb8ae291e
Fix simulator build.
2010-02-11 14:41:20 -08:00
Paul Westbrook
6d3fa27518
Merge "Fix some Gmail tests"
2010-02-11 14:13:10 -08:00
Doug Zongker
f13b12d4f0
add NO_CLOSE flag for use by Base64OutputStream
...
Change-Id: Ib2884e7b3853e4e4b2e329edf47c6f64c2f165a7
2010-02-11 14:07:17 -08:00
Mike LeBeau
b4fd3afb4c
Merge "Add SERVICE_INTERFACE and SERVICE_META_DATA constants to RecognitionService, to be used by anyone implementing a voice recognition service. Also define a new <recognition-service> styleable to be used in such service's metadata xml."
2010-02-11 14:05:27 -08:00
Marco Nelissen
a32a6a428d
Merge "Add support for "album artist" tag."
2010-02-11 13:43:40 -08:00
Mathias Agopian
9cce325fae
split libsurfaceflinger_client and libcamera_client out of libui
2010-02-11 13:16:22 -08:00
Andreas Huber
4fae0fd0c9
Merge "Support for rendering through an overlay on the droid even if a software renderer is active."
2010-02-11 12:44:03 -08:00
Tobias Haamel
70fa84f6ab
Introduce special UI modes for night and car usage.
...
The device mode is now called ui mode. Furthermore is the order of
precedence for the resources now in such a way that the ui mode needs
to be specified after the orientation and before the density.
The ui mode can be set, like it is done for the locale, as follows:
IActivityManager am = ActivityManagerNative.getDefault();
Configuration config = am.getConfiguration();
config.uiMode = Configuration.UI_MODE_TYPE_CAR | Configuration.UI_MODE_NIGHT_ANY;
am.updateConfiguration(config);
To allow users to disable the car mode and set the night mode the IUiModeManager
interface is used.
The automatic night mode switching will be added in a separate change.
2010-02-11 21:25:58 +01:00
Charles Chen
6ecdf97577
Merge "Setting the synth busy flag inside a synchronized block for thread safety."
2010-02-11 11:58:01 -08:00
Mike LeBeau
f45c6ca3c2
Merge "Add new setting for the ComponentName of the service to be used for voice recognition on the device. Right now this just queries the package manager at boot and finds the (hopefully) single available recognizer."
2010-02-11 11:41:16 -08:00
The Android Open Source Project
58cfeccb9e
am 1e90ab54: merge from open-source master
...
Merge commit '1e90ab542d675616e9370ab7e5add99d7af12587'
* commit '1e90ab542d675616e9370ab7e5add99d7af12587':
Fixs the incorrect message for SecurityException
Default RotateDrawable's pivot set to (50%, 50%)
2010-02-11 11:20:40 -08:00
Eric Laurent
42481bcbb5
Merge "resolved conflicts for merge of 61bb25f2 to master"
2010-02-11 11:16:36 -08:00
David Turner
ec44978757
Merge "Fix installd to create /data/data/<pkgname> with appropriate permissions."
2010-02-11 10:58:29 -08:00
Dan Egnor
3aa1d039db
Merge "Truncate SYSTEM_TOMBSTONE events at the end (take the head), but still truncate the other log files at the start (take the tail)."
2010-02-11 10:47:41 -08:00
Eric Laurent
72b44cf074
resolved conflicts for merge of 61bb25f2 to master
2010-02-11 10:38:28 -08:00
San Mehat
28600b5bbf
Merge "MountService: Fix some mountset bugs and tighten up some return values"
2010-02-11 10:25:59 -08:00
The Android Open Source Project
6e03ece9c9
merge from open-source master
2010-02-11 10:03:02 -08:00
Ying Wang
4214fb1f11
Merge "Support for product specific fallback font file."
2010-02-11 09:39:22 -08:00
Eric Laurent
8727c24cf2
am c1eba82b: Merge "Fix issue: 2413494: Add TTY support." into eclair
...
Merge commit 'c1eba82ba479006045c1d7a4c8ceba116a9602d1' into eclair-plus-aosp
* commit 'c1eba82ba479006045c1d7a4c8ceba116a9602d1':
Fix issue: 2413494: Add TTY support.
2010-02-11 09:34:59 -08:00
Eric Laurent
fde9e349dd
Merge "Fix issue: 2413494: Add TTY support." into eclair
2010-02-11 09:23:21 -08:00
Bjorn Bringert
9e07e096b0
Merge "Add content provider for browser geolocation permissions"
2010-02-11 02:05:30 -08:00
Bjorn Bringert
aaae8950a4
Merge "Fix NPE in AppWidgetService.addProvidersForPackageLocked()"
2010-02-11 02:00:24 -08:00
Jason Sams
bb756d2d9b
Merge "Change default mode."
2010-02-10 18:10:02 -08:00
Jason Sams
d8b49c1901
Merge "Add java benchmark to imageProcessing."
2010-02-10 18:08:28 -08:00
Jason Sams
9cc062d2ee
Merge "Cleanup image processing example script."
2010-02-10 16:59:47 -08:00
Oscar Montemayor
e521a3d4e3
Merge "Fix for bug 2427961 android.security.tests.SystemKeyStoreTest:testBasicAccess is failing. Fixed issues in test."
2010-02-10 16:33:01 -08:00
Jim Miller
03cd968f22
Merge "Fix 2373088: Cleanup and minor fixes to PasswordKeyboard*."
2010-02-10 15:45:32 -08:00
Andreas Huber
11fe4015a6
Merge "Fixing AMR recording code."
2010-02-10 15:16:09 -08:00
Jason Sams
2b5c721464
Merge "Fix ImageProcessing example."
2010-02-10 15:04:56 -08:00
Ben Cheng
330c55d0a8
Merge "Support per-application switch to execute the VM in safe mode."
2010-02-10 14:52:53 -08:00
Shimeng (Simon) Wang
6e00aae5c7
Merge "Add back lost python script."
2010-02-10 14:52:07 -08:00
Dan Egnor
92d543f639
API CHANGE: Add SSLSessionCache public API to allow unbundled SSL session caching.
...
Generally clean up the associated SSLCertificateSocketFactory API as well,
change AndroidHttpClient to use this new thing, and make the android-common
library build SDK-clean (woo hoo).
Bug: 2362543
Bug: 2357311
2010-02-10 14:43:21 -08:00
Marco Nelissen
aa5be64fe0
Merge "Do autodetection even if no locale was specified, and use the detected encoding if it is unambiguous."
2010-02-10 14:24:44 -08:00
Suchi Amalapurapu
cf1a51c008
Merge "Set default value for default install location"
2010-02-10 12:45:16 -08:00
Doug Zongker
89dce4f6d7
Merge "add Base64OutputStream to android-common"
2010-02-10 11:47:17 -08:00
Fred Quintana
6a9ab1b4d6
Merge "fix an NPE in SyncManager's dump where it can get a null AuthorityInfo; instead create one if one doesn't exist yet"
2010-02-10 11:45:47 -08:00
Romain Guy
7822585123
Merge "Prevent infinite loop in the Phone UI."
2010-02-10 11:30:03 -08:00
Shimeng (Simon) Wang
56811abc37
Add back lost python script.
...
The script is used to generate top level domains' regular expressions.
This is enhanced and used to regenerate the new top level domains.
new file: common/tools/make-iana-tld-pattern.py
2010-02-10 11:22:01 -08:00
San Mehat
bcf1622cd3
Merge "StorageNotification: Move notification / usb storage activity into StatusBarPolicy"
2010-02-10 11:21:50 -08:00
Andreas Huber
2b42e49a03
Merge "Properly detect Adobe's .f4v file format as an mp4 ISO compliant file."
2010-02-10 11:16:14 -08:00
Doug Zongker
0ab1771146
add Base64OutputStream to android-common
...
Base64OutputStream is a FilterOutputStream that can encode or decode
base-64 data (with any of the flags supported by the Base64 class --
crlf, padding vs not, line wrapping vs not, etc.)
We change Base64 to have package-private decodeInternal and
encodeInternal methods that save all their state in objects and can be
called multiple times to stream data. The existing functions for
in-memory encoding/decoding call the internal method once; the output
stream calls it multiple times.
Change-Id: Iac661d05329bc2e6b2863088efcedc974415ec44
2010-02-10 11:10:53 -08:00
Marco Nelissen
6d65fdbed1
Merge "Don't create a genre in the database for genre code 255 (unknown)"
2010-02-10 09:50:44 -08:00
Dirk Dougherty
c0aa90f652
am 87bdfd6d: am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
...
Merge commit '87bdfd6d22ee964339791bb65686a718d207793b'
* commit '87bdfd6d22ee964339791bb65686a718d207793b':
Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
2010-02-10 09:46:08 -08:00
Bart Sears
d7a11c5771
am eb42a288: (-s ours) am a1ab9766: Merge "DO NOT MERGE" into eclair
...
Merge commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf'
* commit 'eb42a28837e19722fd8c4ba13f13068581c4bdbf':
DO NOT MERGE
2010-02-10 09:45:57 -08:00
Dirk Dougherty
3b3237bf4c
am d74bf162: Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
...
Merge commit 'd74bf1623913bade8f58369f39ebc666d551bb57' into eclair-plus-aosp
* commit 'd74bf1623913bade8f58369f39ebc666d551bb57':
Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper.
2010-02-10 09:41:15 -08:00
Bart Sears
77eb6fb19b
am a1ab9766: Merge "DO NOT MERGE" into eclair
...
Merge commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp
* commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db':
DO NOT MERGE
2010-02-10 09:41:06 -08:00
Dirk Dougherty
a10ec4b8b1
Merge "Repackage samples zip with SampleSyncAdapter and CubeLiveWallpaper." into eclair
2010-02-10 09:38:01 -08:00