Merge commit '9274988e444da3b8652912f1a3c0cf0847f19fe3'
* commit '9274988e444da3b8652912f1a3c0cf0847f19fe3':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911: Crash in system process
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
Merge commit '019116ce202021e1b274516c9813aeff83b1b5ab'
* commit '019116ce202021e1b274516c9813aeff83b1b5ab':
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
Merge commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69' into eclair-plus-aosp
* commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69':
Fixed the long recorder time and reduce the number of loops.
Merge commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782' into eclair-plus-aosp
* commit '2a35c8d7017e4a9408a3c3b8ef1145df082d6782':
fix account permission strings. this permission is used to protect more than just Google accounts.
* changes:
Better event log tracking for initializeDevice() requests -- on success, record "backup_initialize" event; on failure, record "backup_transport_failure" event (and add tags to "backup_transport_failure" events that aren't associated with a particular package -- namely "(initialize)" and "(finish)").
on success, record "backup_initialize" event; on failure,
record "backup_transport_failure" event (and add tags to
"backup_transport_failure" events that aren't associated
with a particular package -- namely "(initialize)" and
"(finish)").
Merge commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2' into eclair-plus-aosp
* commit '2e4dbe70e7c0fe003dab0837fd1dba2703bdd6e2':
Unhide APIs for enabling geolocation in web views. I've confirmed
Merge commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0' into eclair-plus-aosp
* commit 'a4c96aa2fadb0c8642a2c8da5f8368cc3de06ed0':
Fix for 2133391: Allow menu hard key to be disabled in LockScreen on some devices
Merge commit 'dd49055a9dc4c0e66671a80bb51cac946b431029' into eclair-plus-aosp
* commit 'dd49055a9dc4c0e66671a80bb51cac946b431029':
Update 4.xml with the native status change of breakText/measureText
Merge commit 'ac18e4f238650aa4bf8b6c7540d928b0249cfd99' into eclair
* commit 'ac18e4f238650aa4bf8b6c7540d928b0249cfd99':
Update 4.xml with the native status change of breakText/measureText
Merge commit '989384b20af6e76ded9ddbac77d9d7db37f3326f' into eclair-plus-aosp
* commit '989384b20af6e76ded9ddbac77d9d7db37f3326f':
Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit 'e5faf231e0cca9c786492b36e4abcc648c1aec8d' into eclair-plus-aosp
* commit 'e5faf231e0cca9c786492b36e4abcc648c1aec8d':
Fix broken build. (do not merge)
Merge commit 'c9c834f9f35a54ee110bf07182ee03eabb2e9bad' into eclair-plus-aosp
* commit 'c9c834f9f35a54ee110bf07182ee03eabb2e9bad':
Add density support to layoutlib so that bitmap are scaled if needed.
Merge commit '3e211b563c7a52185b748d0f38dda3a3e76cf856' into eclair-plus-aosp
* commit '3e211b563c7a52185b748d0f38dda3a3e76cf856':
Add density value to density enum.
Merge commit '19ea135407e225777750fda5955d92f508c7968b' into eclair-plus-aosp
* commit '19ea135407e225777750fda5955d92f508c7968b':
Add a new IResourceValue that knows about the density.
Merge commit 'e67f0c9712890f3af19d1213ff4c4b049c401226' into eclair
* commit 'e67f0c9712890f3af19d1213ff4c4b049c401226':
Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)
Merge commit 'd135b0937875b405a20f735189040d5cb4d2546d' into eclair
* commit 'd135b0937875b405a20f735189040d5cb4d2546d':
Fix broken build. (do not merge)
Merge commit '08905850084c501585fb0a89c346b1be6a103ca1' into eclair
* commit '08905850084c501585fb0a89c346b1be6a103ca1':
Add density support to layoutlib so that bitmap are scaled if needed.
Merge commit 'f05f92a24214f04c88ed3161a4cc684d70192cc1' into eclair
* commit 'f05f92a24214f04c88ed3161a4cc684d70192cc1':
Add density value to density enum.
Merge commit '59b30f6958f0460b59d050cde34aa863ec9b77c2' into eclair
* commit '59b30f6958f0460b59d050cde34aa863ec9b77c2':
Add a new IResourceValue that knows about the density.
Adds a mechanism to tell Paint the scaling factor its target
canvas will have, for it to compute font metrics based on the
correct font size. Only TextView uses this, but that is enough
for the large majority of apps.
This is integrated from the Eclair branch.
Merge commit '91c6bdd20365a5c6d33986cb941aa085864d016e' into eclair-plus-aosp
* commit '91c6bdd20365a5c6d33986cb941aa085864d016e':
Simplify the layout of all activities with a title and a progress bar.
Merge commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91' into eclair-plus-aosp
* commit '072c9e7473f4ff1a1b08ec08a906cc8308ed1c91':
Add more useful-for-debug info to 'dumpsys backup'
Merge commit '92f0370cf09ef835c72099864fe7c0e7b7389877' into eclair-plus-aosp
* commit '92f0370cf09ef835c72099864fe7c0e7b7389877':
Fix disabled text color in choice dialogs.
