Merge commit '9ca231c5b616f7240021906b0decd1d412df00ab'
* commit '9ca231c5b616f7240021906b0decd1d412df00ab':
Basic API for third-party apps to define custom Data rows.
To display styled ContactsContract.Data rows in UI, this
change adds basic styling attributes that third-party apps
can use. The Contacts app parses these structures before
displaying Data rows with unrecognized MIME-types.
Partially fixes http://b/2126691
Add API to skip the animation for a particular start activity, so that
a latter better one can be used.
Fix Theme.NoDisplay to actually work.
Fiddle with various animations: don't do a different animation for task
switching, try a scale animation for switching in/out of the wallpaper.
Adjust the animation duration so that at normal speed we have something
more like the slower animation option (so slow is now the default).
Change-Id: Ieba9f3db0bd9a762a19b327a3ecccbc7b547893d
Merge commit '9aa0005e24e4da8004317cd1f632afb567c50ca1'
* commit '9aa0005e24e4da8004317cd1f632afb567c50ca1':
Update getDisplayLabel() API to support new types.
We recently added several new phone types, and this change
updates the API that resolves thoses types to strings. It
also uses unique string resources for each type, instead of
relying on types to be <string-array> indexes.
Fixes http://b/2118886
We had discussed doing this in Donut but looks like it never happened. We need these
attributes for voice search so now's as good a time as any.
Followup CL to 25911.
Merge commit '09481271507cfac0db2f27b878f4a453ed919fb1'
* commit '09481271507cfac0db2f27b878f4a453ed919fb1':
Track CPU speed stepping to get more accurate CPU cost per app.
More CPU speed stepping happening with newer devices, so we need
to qualify CPU time with the CPU speed, since power consumption
varies greatly by speed. Apps that peg the CPU should get a higher
penaltly.
Also, fix for 2062930: NPE at VolumePreference.onKey()
Merge commit '7b17c0bf355e6a5fd66b14a4c2cbbbd772f0ab6b'
* commit '7b17c0bf355e6a5fd66b14a4c2cbbbd772f0ab6b':
Add config_use_strict_phone_number_comparation, which will be used by internal applications.
Merge commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707'
* commit '3bd5e2b22efe0da3864bc6d8c5aae68742c3c707':
Add better APIs for the battery status, and other cleanup.
attr/textAppearanceSearchResultTitle. We had discussed doing
this in Donut but looks like it never happened. We need these
attributes for voice search so now's as good a time as any.
Merge commit '9fd4219923901a3c1fdb5789431e49b76538fb91'
* commit '9fd4219923901a3c1fdb5789431e49b76538fb91':
More hi-res assets, and darken background color to donut level.
Merge commit 'e064bd8e34f7908c7291956702dce8ae292f67ca'
* commit 'e064bd8e34f7908c7291956702dce8ae292f67ca':
Fix http://b/2086471 (list view headers too dark in mdpi).
Merge commit '1e8c95318f0cce70dc66fb29036d084d5665abd8'
* commit '1e8c95318f0cce70dc66fb29036d084d5665abd8':
Show the live wallpaper on the lock screen.
This also takes care of the problem of system dialogs like the
crash dialog causing the status bar to dim behind the lock screen.
On the down side, the fade transition from the lock screen is
now gone, and I'm not sure how likely it is for it to return.
Change-Id: I7f9e6d0f3510a1fdbbe6ad252d986bd85a16475d
Merge commit 'a891bce913b55db4f60d2cada544229306a18271'
* commit 'a891bce913b55db4f60d2cada544229306a18271':
First pass at pattern lock screen that includes date / time and carrier info (framework portion).
Merge commit 'aa3620f3999ccf2d79105bdc3641ce4c9134032e'
* commit 'aa3620f3999ccf2d79105bdc3641ce4c9134032e':
Add a new flag for IMEs to disable suggestions for certain fields.
Merge commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e'
* commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e':
Change Theme.Light's background back to pure white.
Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0'
* commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0':
Fix a handful of bugs in the ContactHeaderWidget
Merge commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18'
* commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18':
Combine the "Permission Requested" title and subtitle into one string.
Merge commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a'
* commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a':
Use separate resources to control orientation change for car and desk docks.
Merge commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d'
* commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d':
Implement issue #1780928: Need support hiding nav keys.
Merge commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00'
* commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00':
Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
Merge commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca'
* commit 'e10bbc50a69201d2dd61b414ffd77cf2a6bc2dca':
Allow only System Service to send most Bluetooth intents.
Merge commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5'
* commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5':
change to use the new CALLER_IS_SYNCADAPTER flag
