Merge commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa'
* commit 'aab601168caec83cf1ca3f235d3a6b308a5dedaa':
b/2224837 Changed the plumbing of how alerts/notifications work.
Merge commit 'e9db8335c01aa47799403b59718811ec703cfe61'
* commit 'e9db8335c01aa47799403b59718811ec703cfe61':
check to see if nav cache is up to date on tap
Merge commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c' into eclair-mr2-plus-aosp
* commit 'cdaeafd440e61e1b64fbd46107157f3c74d1c09c':
b/2224837 Changed the plumbing of how alerts/notifications work.
Instead of processing each notification separately event (scheduling an alarm with AlarmManager for each event, posting notification to NotificationManager for each event, etc), only one alarm should be fired for each wake-up time. AlertService will look through the CalendarAlerts table and decides how to update the notication manager. This is more efficient and simplifies the codecode. It is also the long-term fix to elimiate overlapping notification ring tones e.g. DrooDrooDrooooid b/2194249
Also consolidated alarm scheduling code to one place.
Change-Id: If58ce278d55b28abad703f8aeee466d44952fcd0
Merge commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa'
* commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa':
Avoid a crash trying to get a substring whose start is after its end.
Merge commit '07ab85b338d6e08a901a13230ae4cedc57e418ea' into eclair-mr2-plus-aosp
* commit '07ab85b338d6e08a901a13230ae4cedc57e418ea':
Introducing fields for capturing national specifics of contact names.
Merge commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c' into eclair-mr2-plus-aosp
* commit '1cb97eed566014e36a7c2a0b487ec132b7d45e6c':
check to see if nav cache is up to date on tap
Pass point to click in three steps.
1) See if point corresponds to cached node.
2) If so,send a message to webkit to see if the node is good.
3) Call webkit with point, and good/bad info.
This is a two-part change with external/webkit.
Fixes http://b/2249425
Merge commit '725218602e8505cd6fe3075253fcb792727e2431' into eclair-plus-aosp
* commit '725218602e8505cd6fe3075253fcb792727e2431':
Avoid a crash trying to get a substring whose start is after its end.
Merge commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083' into eclair-mr2-plus-aosp
* commit 'aacced6bc5a64c7daa4af2f29b94a1b00770f083':
Provide localized strings for <input> labels.
Merge commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f' into eclair-mr2-plus-aosp
* commit '274dc9d35fdf5d0464f74071a9a8f14e497d4d5f':
moved the hidden sync helpers out of the framework
Fix for http://b/issue?id=2178786
Provide strings for input types file, submit, and reset, and allow
them to be passed down to native.
Requires a change in external/webkit.
Merge commit '83652ebfe1963bcecdcf24383165904223baca6e'
* commit '83652ebfe1963bcecdcf24383165904223baca6e':
Implement API to have new broadcasts replace existing broadcasts.
Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp
* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
Implement API to have new broadcasts replace existing broadcasts.
Add Hanzi to Pinyin converter and sort key for contacts
Sort key and Hanzi to Pinyin converter is used for Chinese
implementation of contacts search, indexing and sorting.
Hanzi to Pinyin converter should be implemented on top of ICU
transliterator in the future.
Change-Id: I620f67c85897ee4054eda2624e7bcc12a81740aa
Merge commit '163964143fe27b7fdbeb51a4fc65d72769c83481' into eclair-mr2-plus-aosp
* commit '163964143fe27b7fdbeb51a4fc65d72769c83481':
Fixed class paths in layout xml files
Use this in various places where it should serve no purpose to deliver
both broadcasts. This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
Merge commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5' into eclair-mr2-plus-aosp
* commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5':
Add account name / type query parameters for calendar Events.
This change fixes the context menu trigger behavior while
the user is selecting via touch. How if a user is selecting
text via dragging their finger, to trigger the context menu
they will have to lift their finger up, then issue a
longpress. This is consistent with the behavior of selecting
via the trackball.
