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.
Merge commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c' into eclair-mr2-plus-aosp
* commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c':
Notify native plugin code when the browser discards the customView.
Merge commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0' into eclair-mr2-plus-aosp
* commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0':
Fix TabHost NPE when there are no tabs
Merge commit 'de0205f3bbda265cf8b53a912190dff86ab5d34e'
* commit 'de0205f3bbda265cf8b53a912190dff86ab5d34e':
Post a Runnable to execute setNewZoomScale when
Merge commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853' into eclair-mr2-plus-aosp
* commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853':
Post a Runnable to execute setNewZoomScale when
Make sure the application is always given the most recent configuration
when launcher. Use the current configuration, instead of whatever happens
to be set by the app, for reporting what it was launched with.
Change-Id: I2ffe306f56cc9092b640546dd0a28d2c29b9c0b3
(CrashData was a custom-marshalled crash-info class used for a server crash
reporting system I am deprecating). Use ApplicationErrorReport.CrashInfo
instead to report crash details (mostly the stack trace) from RuntimeInfo to
ActivityManagerService, since we're likely to need the crash information in
that form anyway.
Remove the (long-disabled) flags and support for the "Debug" button
in the crash dialog.
Further gut the ICheckinService interface by removing the crash-reporting
APIs (and everything that calls them), plus the synchronous checkin()
method (which has been stubbed out for a while now).
A new dropbox-based crash reporting system is in the works, but not part
of this change.
For the docks, we can set if a device is preferred or not
before pairing process. This was getting overridden when we pair.
This problem doesn't happen with normal headsets.
Dr No: Eastham
Bug: 2318290
Merge commit 'be35a4fd8c26749aba27731270f75273dc1590fe'
* commit 'be35a4fd8c26749aba27731270f75273dc1590fe':
Update the zoom buttons after moving to a new page.
Merge commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584' into eclair-mr2-plus-aosp
* commit '6cb69c7d7496943cec7913a3a7ffab7f6d75e584':
Update the zoom buttons after moving to a new page.