Merge commit 'ef29f6afb4746eae8263ab901a5d3677bc04574b'
* commit 'ef29f6afb4746eae8263ab901a5d3677bc04574b':
Fixes#1414069. Display recent activities with two lines of text.
Merge commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef'
* commit '727f36c6a1c70ba5519ec9ce2da9ab1cf303a2ef':
process: Fix bug where if a thread exited while we were changing its control
Fix the build: Remove ADD_SYSTEM_SERVICE, which I had accidentally
Merge commit '3dcea047c5c7a61a56f618815e298d7bd38e2678'
* commit '3dcea047c5c7a61a56f618815e298d7bd38e2678':
Remove obsolete FOTA_UPDATE permission (which should never have been
reintroduced in an errant and clumsy git merge operation.
Also remove permission label and description strings for now-deleted
permissions FOTA_UPDATE and (within the SettingsProvider package)
WRITE_GSERVICES.
made public, and wouldn't be used by any third party applications,
and no longer does anything regardless).
Also remove the WRITE_GSERVICES permission from the SettingsProvider
package's manifest (the declaration there was redundant with the one
in the core manifest, where all the other settings-related permissions
live -- no other core package includes its own permission definitions).
Merge commit '6c84343f0794c368e79c58b715ffad268b8e219c'
* commit '6c84343f0794c368e79c58b715ffad268b8e219c':
Use locale-appropriate formatting to display application sizes like "252KB".
Merge commit '6599426f74371c823fcfe570f61577262eb0df44'
* commit '6599426f74371c823fcfe570f61577262eb0df44':
Make the date format preference work again.
It is only used for numeric dates -- spelled-out dates have such a complex
variety of formats that they can only be meaningfully formatted from
locale strings.
In addition, the preference is left null when initializing, on the assumption
that the locale will still specify a more useful numeric format than we can
guess as part of a build-wide configuration.
But if the user has specified a format, the date will be formatted in the
order they asked for, with locale-appropriate punctuation substituted in.
Merge commit '35733757bd1644f1fd67dc3a055391d1f167c4f2'
* commit '35733757bd1644f1fd67dc3a055391d1f167c4f2':
Hook the 12- or 24-hour time format checkbox back up.
With the new implementation of using a SuggestionItemView, we no longer need to draw a solid background for all items in the suggestion listview. Hence removing the code to draw a default white background, and make the item transparent so the listview-drawn selection hilite shows through.
The format strings are newly generated from CLDR. The code is once again
the same as in cupcake: do the natural thing for the locale if the user
has never specified, but follow the checkbox if the user has ever set it.
If this attribute is provided and true, the searchable activity will be invoked for all queries in a particular session.
If set to false and the activity returned zero results for a query, it will not be invoked again in that session for supersets of that zero-results query. For example, if the activity returned zero results for "bo", it would not be queried again for "bob" as an optimization.
The default value is false.
Merge commit 'b6391d6377883586995127c9926c1b5b8035fd60'
* commit 'b6391d6377883586995127c9926c1b5b8035fd60':
Allow arrays of values for power profile data.
Parse arrays for data that has different levels with non-linear
power increase.
Track radio data awake_time from kernel and mobile/total data
transfers.
Use dummy values for default power_profile.xml. Actual values will
be in a product overlay.
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.
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.
- 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
Merge commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1'
* commit 'd299b8194dde8c4875e5f032918ab35ebad8b1f1':
Add a new attribute to android manifest for defining the GLES version number.
This attribute is parsed by the PackageParser into ConfigurationInfo. The major
and minor version numbers are defined as the higher and lower order bits.
