Merge commit '6b4b50b8079aa274727c3120f858179eb6259351'
* commit '6b4b50b8079aa274727c3120f858179eb6259351':
Add support for custom tab views in TabHost and TabWidget.
This change adds the ability to specify an arbitrary view for a tab
indicator. It also adds support for specifying a drawable to use as
the divider between tab views.
Merge commit '9e09e0f439ab30b8856d46827623652d09b7477b'
* commit '9e09e0f439ab30b8856d46827623652d09b7477b':
zygote: Add CAP_SYS_NICE to system server capabilities
Merge commit 'df01deaacff82b918b4f0ba774d5ad3087543629'
* commit 'df01deaacff82b918b4f0ba774d5ad3087543629':
More restore plumbing, plus add suggested-backoff to transport API
Adds most of the code for a background-thread restore process, structured much
like the backup thread. Broke some common functionality out into a helper
function for doing a synchronous wait for a requested agent to attach.
Added a method to IBackupTransport whereby the transport will be asked for
an opinion on whether this is a good time for a backup to happen. It will
reply with the results of its policymaking around backoff intervals, time-of-day
selection, etc.
Merge commit 'a32b5f3252a58416f328399680395aa5fa936640'
* commit 'a32b5f3252a58416f328399680395aa5fa936640':
Manual merge from cupcake_dcm. Need to be reviewed by enf.
Merge commit '09ea1e9cce29435282eb4c671cf6cebe26414e41'
* commit '09ea1e9cce29435282eb4c671cf6cebe26414e41':
Show progress spinner while waiting for results in in app search.
Merge commit '3b277c700e6907ee0813839604ac60df2141c557'
* commit '3b277c700e6907ee0813839604ac60df2141c557':
Change exceptions to RuntimeException.
Fix the way gestures are rasterized to bitmaps.
This fixes a few places that were accidentally using the wrong numbered
parameter in the format call. It also makes other adjustments so that
the formats for English are exactly the same as they were in Cupcake.
Merge commit '9d19fdb231592904b6f8940355d89745719a1ea1'
* commit '9d19fdb231592904b6f8940355d89745719a1ea1':
Track clicks that occur after pivoting into an app from global search.
Remove the zoom overview and 1x buttons from the ZoomButtonsController,
since the functionality will now be placed elsewhere. Make zoomScrollOut
and canZoomScrollOut public (albeit hidden), so they can be called by the
Browser. Also rename ExtendedZoomControls' mZoomControls to
mPlusMinusZoomControls so they are not confused with WebView's mZoomControls.
(framework portion).
Global search has a write-only content provider for reporting clicks that SearchDialog
makes use of.
update: addressed code review feedback
