Merge commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd'
* commit '2bc9e139655666e3c6a58d8fa74a12111b06cafd':
TypedProperties: add getStringInfo() to help deal with null strings
Merge commit '52a3cb53ddcce049d2e804c3042514df576cb5b9'
* commit '52a3cb53ddcce049d2e804c3042514df576cb5b9':
TypedProperties: change the file format to be a subset of Java
Merge commit '2cd006c8f927d3e364c32f946b844377bdc56d3e'
* commit '2cd006c8f927d3e364c32f946b844377bdc56d3e':
Make the home screen come up in the simulator.
Merge commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c'
* commit '980d12b13bad50d6fbb50f3fe8f8dbc451a7d87c':
Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
* changes:
Fix typo in exception message and add a new exception if the user tries to use the same child as both the handle and content for the SlidingDrawer.
Merge commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8'
* commit 'a039d465a85e8a7dea1ec4b5814e1a6e84e676f8':
Allow access to global search by pressing the hard search button again
* changes:
Allow access to global search by pressing the hard search button again within in-app search. If within in-app search and toggled out to global search, pressing the hard search button will take the user *back* into in-app search too.
Merge commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b'
* commit '5fcfcd0f341e1683352cc3a70af679b26c30a05b':
AI 147994: First cut of CharsetUtils, a utility class that aims to
Merge commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd' into donut
* commit 'b4c218eafd382da778bcc0006de9b8fce267a9cd':
AI 147994: First cut of CharsetUtils, a utility class that aims to
Merge commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c'
* commit 'd4ed0496724d9083ce0762d3a5c0b36183c02f6c':
AI 148024: fix NPE when there is no history
* changes:
MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905
Merge commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e'
* commit '9ae8873ed83035e8527526e2cc1a189caf0e8d9e':
Allow caller-supplied column aliases in queries even when a projection map is used.
Merge commit '649b1c6ec317b6dd61a385df911e7fe543c5871a'
* commit '649b1c6ec317b6dd61a385df911e7fe543c5871a':
CheckedTextView is abstract but can be inflated from XML. Let's be consistent and allow it to be used from Java code as well by making it non-abstract.
Merge commit '80f3b97121477e9ed62193c038772b4d020534df'
* commit '80f3b97121477e9ed62193c038772b4d020534df':
New font that fixes the accent shape/orientation on 1EDD
Merge commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3'
* commit 'c5f1b92d0a480f3119be8ea6eebbada402c17cf3':
Fixes 1819406. Take a ListView, add headers/footers, set the adapter after at least one layout pass, and the headers/footers don't know they have a parent anymore. Which causes a lot of trouble, like drawing not happening.
Merge commit 'b2b841db08057a6dbc86f99fd35106ed741da126'
* commit 'b2b841db08057a6dbc86f99fd35106ed741da126':
AI 147947: update the sitemap. add disallow in robots file for the sdk/preview/
