Merge commit 'b11e670e56b30022dbaaa921390005a95dfd337b'
* commit 'b11e670e56b30022dbaaa921390005a95dfd337b':
Fix some 12- vs 24-hour problems in the FormatDateRange strings.
Use a resource instead of a hardcoded string for the 24-hour format
since it is not exactly the same in every locale.
Make sure the 12-hour format is actually for a 12-hour clock, even in
locales where this is not a normal thing to do. In the cap_ampm version,
do not have it try to capitalize "am" and "pm" if these are non-ASCII
strings, since strftime() doesn't know about Unicode and will mess it up.
Add a comment so that people don't think the YEAR_IN_MILLIS constant is
actually the length of any real year.
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 '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.
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
Merge commit '27a2b50dedd4315b921d502a30ac0fda51fb6a7c'
* commit '27a2b50dedd4315b921d502a30ac0fda51fb6a7c':
Add a hidden API to modify the paint used to draw gestures.
Merge commit '03f0b21b5a317aa6c0f0cd4d7ac91cabdf379d3e'
* commit '03f0b21b5a317aa6c0f0cd4d7ac91cabdf379d3e':
Fix several issues in the gestures libraries.
Merge commit '2d2b23119f1b4daa3064f065ebeb6397963c1780'
* commit '2d2b23119f1b4daa3064f065ebeb6397963c1780':
Fix multiple strokes support when fade is disabled.
In the old navigation model, we set focus to a node, and checked to see
if that node was still valid (could have changed since we built the
navigation cache). Then we sent a message back to the UI thread to
tell it to draw the ring differently. In the new model, we are essentially
moving a mouse, so we do not concern ourselves with whether the node is
valid. Removed all the code for passing the message to the UI thread
and calling into native. Needs a change to external/webkit to work
properly.
- A new column was added to SearchManager cursors to specify background color (optional)
- Two new colour references added to the theme for normal and search widget corpus items (we need both to be opaque for the items to render properly)
- SuggestionAdapter was updated to choose the right theme colour for each item
This mostly fixes how gestures libraries are saved and loaded.
Saving a library twice in a row was erasing the entire library,
which was preventing the sketch test app from working propertly.
Merge commit 'bac43254b219c827f3d1fd286f4a7f19e9ee2f05'
* commit 'bac43254b219c827f3d1fd286f4a7f19e9ee2f05':
In Tts class, removing method to set the specific engine to use as the
Merge commit '97d6f75646703f351894991025d16b14399a11b7'
* commit '97d6f75646703f351894991025d16b14399a11b7':
Moving the Tts java class from the android.tts package to the android.speech.tts package.
* changes:
Moving the Tts java class from the android.tts package to the android.speech.tts package. The Tts class (still hidden at this point) is the only Text-To-Speech class that will be exposed to application developers.
