Merge commit 'ddbeed5d11f2ef0c286bbc9b5283ad0fab62ef5e' into eclair-plus-aosp
* commit 'ddbeed5d11f2ef0c286bbc9b5283ad0fab62ef5e':
Import revised translations. DO NOT MERGE
Merge commit '76a9b9c246efc116967691c5a362c1f68daa6a0b' into eclair-plus-aosp
* commit '76a9b9c246efc116967691c5a362c1f68daa6a0b':
The starting progress for WebView should be 100 as it is
Merge commit '6449eb06acc934ba4007475680f236721181ee47' into eclair-plus-aosp
* commit '6449eb06acc934ba4007475680f236721181ee47':
Added API for triggering FastTrack.
I added a new API to help us move away from launching
FastTrack through SHOW_OR_CREATE. For now it's going to
still pass through as an Intent with extras, but in the
future this could be used to launch a Window from a system
service.
Partially fixes http://b/2087222
Merge commit 'd55de40481c6ec7d8fbd1a38c80a6c66bf462a71' into eclair-plus-aosp
* commit 'd55de40481c6ec7d8fbd1a38c80a6c66bf462a71':
Don't scroll the title bar off screen while loading.
Though the user can still manually scroll the title bar
off screen, we do not want it to happen automatically.
When we load a new page, its scroll position can be
set to (0,0). Make sure that we simply set it to the
top without adding in the title bar's height. Also,
prevent javascript which attempts to scroll the page
to (0,0) or (0,1) from removing the title bar.
Fixes http://b/issue?id=2113398 and http://b/issue?id=2123079
Change-Id: Ida64d8c94be6744c7b0b4d60af1c229b2cc83673
Merge commit '3239de8cd78b3fa292d85ee7658a9871cdfbc79b' into eclair-plus-aosp
* commit '3239de8cd78b3fa292d85ee7658a9871cdfbc79b':
Remove the network connection logic from RequestQueue.
Merge commit '4ac137cad9fb9aa5b69776b4ae3c8f906cc57511' into eclair-plus-aosp
* commit '4ac137cad9fb9aa5b69776b4ae3c8f906cc57511':
Add API to retrieve memory used by running processes.
Merge commit 'dc2aab4ff2afbb414549a0311d46765e62c225be' into eclair-plus-aosp
* commit 'dc2aab4ff2afbb414549a0311d46765e62c225be':
Fix the zoom center. Now there is a titlebar, the zoom center
* changes:
Fix the zoom center. Now there is a titlebar, the zoom center needs to be adjusted for it as the user really cares the spot in the document. We need to pin zoom around that spot.
Merge commit '3065a3cad069b847165c99a38a251c072950d07f' into eclair-plus-aosp
* commit '3065a3cad069b847165c99a38a251c072950d07f':
Another stagefright test-case and ignore end-of-stream notifications while we're flushing.
Issue: While in emergency mode, if we receive a message, there is a notification
being shown as "Text Message rejected".
Fix: In CdmaSMSDispatcher.java, send RESULT_OK response instead of RESULT_SMS_GENERIC_ERROR
for messages during Emergency mode. So, that SMS_REJECTED action is not broadcasted.
If the result is RESULT_OK from CdmaSMSDispatcher, the function notifyAndAcknowledgeLastIncomingSms()
is not called from SMSDispatcher.java and hence SMS_REJECTED_ACTION intent is not broadcast.
Consequently SMSRejectReceiver.java will not receive the broadcast and will not show reject
notification.
Change-Id: I2aa8f239393b3e6eeac6b0c2bb69799018e9ae9d
Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp
* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
Merge commit 'dfe095a045f132dd9c75da4286b87532d9a973a0' into eclair-plus-aosp
* commit 'dfe095a045f132dd9c75da4286b87532d9a973a0':
Don't change the zoom filter during the zoom animation.
Call another invalidate() to draw with the final filters.
This fixed the problem where the end of the zoom animation
is slow and jagged.
Fix http://b/issue?id=2126523
Merge commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6' into eclair-plus-aosp
* commit '6c41feadc30448adba4f771b3c1b4ecda8d875b6':
LocationManagerService: Take fix accuracy into account in proximity zone logic.
In some cases a sms acknowledgement might be lost. The network will then resend
the same sms. These duplicate sms should be acknowledged but not shown to the
user.
C.S0015-B 4.3.1.6 Unique Message Identification.
The fields used to identify a message are:
* Message Identifier,
* Originating Address,
* Originating Subaddress, and
* Message Center Time Stamp.
Since some of the fields are optional, the Teleservice Layer shall use as
many of the fields as are present in the SMS message to determine message
uniqueness. Mobile stations should discard repeated messages.
1. Add a fingerprint function to SmsMessage.java. This returns a byte array
to be used as a unique identifier. Parts that make up the identifier are
the originating address, teleservice id and the bearerdata. Using all of
the bearerdata saves parsing time. There are no random bits allowed in
the standard. This makes binary comparison possible. Using all of the
bearerdata accounts for the message id, smsc timestamp and "... shall
use as many of the fields as are present in the SMS message".
2. Have CdmaSMSDispatcher.dispatchMessage() pull a fingerprint and check if
it matches the last acknowledged fingerprint. When it matches return and
signal that message was handled.
3. Have CdmaSMSDispatcher.acknowledgeLastIncomingSms() take the last
dispatched fingerprint move it to the last acknowledged fingerprint.
Only do this if processing of the sms was successful.
Change-Id: If79f8fe40896cd290940b7ccd5a17531ab937b60
Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp
* commit '2f77ffb087892f9474b35cb019f593025653e492':
Don't crash if the cursor is null.
Merge commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823' into eclair-plus-aosp
* commit 'f7c98e8d1827510a90699b4641eb1937d2e0b823':
Wire the rest of MediaPlayer to our implementation of WebCore::MediaPlayerPrivate
