Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp
* commit '513069c39cd6610db2919c09abea2ff73158356a':
Make a path constant
In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing. Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation. (And fix a recently-introduced string
that has exactly this problem.)
Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.
Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
Merge commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5' into eclair-plus-aosp
* commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5':
When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
Merge commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019' into eclair-plus-aosp
* commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019':
Some fixes to SMS processing in the framework.
Merge commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f' into eclair-plus-aosp
* commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f':
Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
Merge commit '6ff270fd854d7c62f857998446fccb803004f1c3' into eclair-plus-aosp
* commit '6ff270fd854d7c62f857998446fccb803004f1c3':
Breaking sleep after yield into small quanta.
Merge commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9' into eclair-plus-aosp
* commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9':
Various infrastructure to support a running services UI.
Merge commit '87b455f5581b3cc3edb9003592a11a1a43104109' into eclair-plus-aosp
* commit '87b455f5581b3cc3edb9003592a11a1a43104109':
Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
Merge commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3' into eclair-plus-aosp
* commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3':
Create new hdpi versions of 1x data statusbar icons.
Merge commit 'b7559e02803266e5fa9f4496174bc343ecd245ab' into eclair-plus-aosp
* commit 'b7559e02803266e5fa9f4496174bc343ecd245ab':
Fix an emoji-measuring bug that caused an exception when editing a contact.
Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair
* commit '56205fea879543a50bb797016832416a8b48cabb':
Fix an emoji-measuring bug that caused an exception when editing a contact.
Merge commit '46c158234dee0d1d47f06b7661150c18512dc589' into eclair-plus-aosp
* commit '46c158234dee0d1d47f06b7661150c18512dc589':
Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
Merge commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651' into eclair-plus-aosp
* commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651':
At leaset log the layout test timeouts
Merge commit '169ae05f9f5cce400dd936e2a31676b80d84b862' into eclair-plus-aosp
* commit '169ae05f9f5cce400dd936e2a31676b80d84b862':
if exception getMessage() is null, don't add it to the error
Merge commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030' into eclair-plus-aosp
* commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030':
When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
* changes:
When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
Merge commit '05a6f3cde52e5fbbad5187615bfc87d58559161f' into eclair-plus-aosp
* commit '05a6f3cde52e5fbbad5187615bfc87d58559161f':
Fix a docs comment to match the parameter name.
In AudioFlinger::MixerThread::putTracks(), change the mFillingUpStatus flag to FS_FILLING for active tracks so that mute request is executed without ramping volume down when the track is moved from A2DP to hardware output.
Also modified AudioFlinger::setStreamOutput() so that the notification of the change is sent only once to AudioSystem.
Merge commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c' into eclair-plus-aosp
* commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c':
Fix the documentation for onReceivedError.
Merge commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb' into eclair-plus-aosp
* commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb':
Moves GoogleLocationSettingManager to its correct location.
Merge commit '84c4548d046c7426cd346602cec18b98fdcdbf3c' into eclair-plus-aosp
* commit '84c4548d046c7426cd346602cec18b98fdcdbf3c':
LocationManagerService: Remove caching of last known locations to flash.
LocationManagerService: Add null pointer check and remove useless finalize() method.
Merge commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8' into eclair-plus-aosp
* commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8':
Move SMS pdu creation fully into the central Phone process.
* changes:
LocationManagerService: Remove caching of last known locations to flash.
LocationManagerService: Add null pointer check and remove useless finalize() method.
Merge commit 'ce54003aa8961764763c4045991b730974fa9083' into eclair-plus-aosp
* commit 'ce54003aa8961764763c4045991b730974fa9083':
allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
Merge commit '95434bfaee62161ce02012c6424f0c0c8fffccb5' into eclair-plus-aosp
* commit '95434bfaee62161ce02012c6424f0c0c8fffccb5':
Allow fragmentText to be called for singleton CDMA messages.
