Winson Chung
f62ff50168
am 14176afa: Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev
...
* commit '14176afa349fb17ba6327e12882e503fd84f41a0':
Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
2014-08-08 20:56:09 +00:00
Amith Yamasani
377d926096
am c35d3ebb: Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev
...
* commit 'c35d3ebb1381e52db1929206524a72d258ba6aea':
No need to send PRE_BOOT_COMPLETED for new users
2014-08-08 20:56:04 +00:00
John Reck
972466f7e9
am 4f215996: Fix damage for layers for projection receivers
...
* commit '4f2159960c7a8921834677f748d7018774685a21':
Fix damage for layers for projection receivers
2014-08-08 20:43:52 +00:00
Ricardo Cervera
6bb49e4ae6
Merge "docs: Fixed minor issue with Studio shortcuts" into klp-modular-docs
2014-08-08 20:34:05 +00:00
John Spurlock
1d1720fd93
Merge "QS: Fix some QS layout issues." into lmp-dev
2014-08-08 20:34:05 +00:00
John Spurlock
bceed060f0
QS: Fix some QS layout issues.
...
- Make the tile list configurable for testing.
- Support an external tile backed by a sticky broadcast intent.
- Ensure tiles clean up properly when no longer needed.
Bug:16818269
Bug:16822505
Change-Id: Ie24f878aae0d19c7f1feca4c519d10667023bef3
2014-08-11 10:19:21 -04:00
Nicolas Prevot
4c8db339bb
Merge "Removing the personal icon, which was only a placeholder." into lmp-dev
2014-08-08 20:34:05 +00:00
Nicolas Prevot
aac303d0a2
Removing the personal icon, which was only a placeholder.
...
This icon should never show up: the avatar of the personal space should show up instead.
If something goes wrong and correct avatar fails to show, the systems falls back to the green android now, which is desired behaviour.
BUG: 15875652
Change-Id: I41beb4cbd5e707d27ef6d4cf35d02ec9cfa1b61d
2014-08-11 11:29:26 +00:00
Dongwon Kang
9dfd731db5
Merge "TIF: introducing TvInputSettings for put/getting user preferences from Settings." into lmp-dev
2014-08-08 20:34:05 +00:00
Dongwon Kang
4d933a0ef0
TIF: introducing TvInputSettings for put/getting user preferences from Settings.
...
Reference:
- Settings.Secure.ENABLED_INPUT_METHODS
- InputMethodSettings
Bug: 16876078
Change-Id: I72c1770517052188694f21c10da383338edc8ee2
2014-08-08 21:36:50 +00:00
John Reck
a7c2ea20c4
Fix damage for layers for projection receivers
...
Bug: 16880228
Change-Id: I59ab760a21f49cc2cac0d8936b173cff292e6114
2014-08-08 20:24:34 +00:00
John Spurlock
f36a999bf4
am 508dc373: Merge "New api to sync zen mode state from listeners." into lmp-dev
...
* commit '508dc373dd3eda0da7ff104fd60acbd1338ae718':
New api to sync zen mode state from listeners.
2014-08-08 20:16:53 +00:00
Dake Gu
68a9804301
am afb539e6: Merge "Transition: remap if views in calling activity became invalid" into lmp-dev
...
* commit 'afb539e6746f19498dced6758cf59b5074e7c76b':
Transition: remap if views in calling activity became invalid
2014-08-08 19:36:01 +00:00
Alan Viverette
ad43b0450d
am 4f048817: Merge "Don\'t make ripples respond to selection state" into lmp-dev
...
* commit '4f048817789e7d7a4f6c84ebd7d1624b87470f5f':
Don't make ripples respond to selection state
2014-08-08 19:35:57 +00:00
Andrew Lee
27273215a8
am 9ce25877: Aidl changes related to VideoCallProvider in Ims.
...
* commit '9ce25877dcaf82d799a9bffac6180bb56d10e66c':
Aidl changes related to VideoCallProvider in Ims.
2014-08-08 19:31:38 +00:00
Jean-Michel Trivi
6894cd38eb
Define FLAG_BEACON in android.media.AudioAttributes
...
Define FLAG_BEACON as @SystemAPI
Keep track of which flags are public, and the list of all
supported flags for easier code maintenance.
Bug 15415971
Change-Id: Ia7675e8fa4bc7c4d7a8f727fd25ff92ecb68483c
2014-08-08 12:16:12 -07:00
Andrew Lee
752217bfc6
Aidl changes related to VideoCallProvider in Ims.
...
+ Added a getVideoCallProvider function in IImsCallSession
+ Added IImsVideoCallProvider aidl. This is used for communication
between Telephony and the ImsService. It is redundant with
IVideoCallProvider on some level, but see associated bug and comments
in the class for more detail.
+ Added IImsVideoCallCallback. This is used for communicationing
callback invocations from ImsService to Telephony. It is redundant
with IVideoCallCallback for same reason in bugs/comments.
+ Some minor formatting changes.
Bug: 16886403
Change-Id: I03de12d4432f837e0930bc077307509b645493e0
2014-08-08 12:09:54 -07:00
John Reck
8406a9ea09
am 30f8cc8d: Merge "Don\'t use ViewPropertyAnimatorRT yet" into lmp-dev
...
* commit '30f8cc8db6286ad4e2508bce3a48ee7ae0eb9b4c':
Don't use ViewPropertyAnimatorRT yet
2014-08-08 19:08:58 +00:00
Guang Zhu
4d98b3a3d9
am 011caab6: Merge "freeze screen rotation during memory and app launch test" into lmp-dev
...
* commit '011caab6fd12db45d314868f113bbc2ec38626d3':
freeze screen rotation during memory and app launch test
2014-08-08 18:38:59 +00:00
Craig Stout
7f9988f0f5
Fix NPEs when inflating a ValueAnimator.
...
Change-Id: I4489b9e80635053792668a2f8032635893fb4afd
2014-08-08 11:17:50 -07:00
John Spurlock
16e767ab09
Merge "Doze: Pulse once when a pickup gesture is received." into lmp-dev
2014-08-08 18:15:47 +00:00
John Spurlock
559d959b99
Doze: Pulse once when a pickup gesture is received.
...
- If configured, wire up the default sensor of TYPE_PICK_UP_GESTURE
as a signal to pulse (once) when dozing.
- Extend the duration that a pulse is visible.
- Skip the pre-pulse delay for the sensor signals.
Bug:15863249
Change-Id: I70e39fc5626fef5570ef74464c919427e0721c32
2014-08-09 12:04:36 -04:00
Adam Lesinski
81f6d857c1
Merge "Second iteration of the UsageStats API" into lmp-dev
2014-08-08 18:15:47 +00:00
Adam Lesinski
3516800b61
Second iteration of the UsageStats API
...
Based on feedback from API council, updated the API.
Also added support for querying the event log.
Change-Id: Ibaa008b9e5bd145acdfe8e20c25c2ed2d96be123
2014-08-08 12:08:15 -07:00
John Spurlock
5c8ea2c369
Merge "New api to sync zen mode state from listeners." into lmp-dev
2014-08-08 18:15:47 +00:00
George Mount
fe361d2113
Move shared elements to overlay when in a transition group.
...
Bug 15744995
Change-Id: Icf1ee603de23c7bb3bce3723cb24009e36f153d7
2014-08-08 18:01:31 +00:00
Nicolas Prevot
3bc02c2487
am 836bfd4f: Merge "Validate that the authority of incoming uris matches." into lmp-dev
...
* commit '836bfd4f50c4061a70203bc90ebb74b6e0bc4ae6':
Validate that the authority of incoming uris matches.
2014-08-08 17:46:23 +00:00
Torne (Richard Coles)
f17f4cf9fc
am 91eb4fc1: Merge "Make WebViewFactory more robust." into lmp-dev
...
* commit '91eb4fc134d85ce552c5d1174288b78cb252ece4':
Make WebViewFactory more robust.
2014-08-08 17:46:19 +00:00
Narayan Kamath
e766c87762
am e00c3d37: Merge "Reduce the frequency of calls to isDexOptNeededInternal." into lmp-dev
...
* commit 'e00c3d3793983eb5fb2b29fb645121f7fcf05d89':
Reduce the frequency of calls to isDexOptNeededInternal.
2014-08-08 17:46:13 +00:00
Nicolas Prevot
e8b674be1c
am f943eff8: Merge "Making getProviderMimeType work across users." into lmp-dev
...
* commit 'f943eff8ba61e9b9b96f887feb727cc68d884e73':
Making getProviderMimeType work across users.
2014-08-08 17:46:08 +00:00
RoboErik
3bed27572e
am 6ac104ce: Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
...
* commit '6ac104ce57c7337cfd17f53732ca2b645d472830':
Combine MediaSession Callback and TransportControlsCallback
2014-08-08 17:41:41 +00:00
RoboErik
9f2ada4260
am 027ffc1f: Merge "Change URI type metadata back to text" into lmp-dev
...
* commit '027ffc1ff48b14aac43e895d221b42953883cb98':
Change URI type metadata back to text
2014-08-08 17:41:37 +00:00
RoboErik
e20dd9f166
am b64e9e56: Unhide MediaMetadata.Description
...
* commit 'b64e9e56368001c87ac4decacb9a514980f49aff':
Unhide MediaMetadata.Description
2014-08-08 17:32:49 +00:00
ztenghui
61a6184681
Merge "Update attrs / public.xml for VectorDrawable opacity removal" into lmp-dev
2014-08-08 17:26:08 +00:00
ztenghui
d0d0f1ff59
Update attrs / public.xml for VectorDrawable opacity removal
...
bug:16850076
Change-Id: Ib6fea828b14e85cacccc8a901227a8fb068f9121
2014-08-08 19:48:36 +00:00
Amith Yamasani
40bc0186d0
Merge "No need to send PRE_BOOT_COMPLETED for new users" into lmp-dev
2014-08-08 17:26:08 +00:00
Amith Yamasani
c2f20b66fd
No need to send PRE_BOOT_COMPLETED for new users
...
Since the primary purpose is to upgrade databases, no need
to send this broadcast. If system apps care to be informed early
on new user creation, USER_INITIALIZE is an early broadcast.
Also remove some logs that spew when switching users.
Bug: 16846465
Change-Id: Ibd7f8630ce1f41f8cadbda616de05844b127d1a8
2014-08-08 12:15:17 -07:00
John Reck
171927a62a
Merge "Don't use ViewPropertyAnimatorRT yet" into lmp-dev
2014-08-08 17:26:08 +00:00
John Reck
4937a70cc6
Don't use ViewPropertyAnimatorRT yet
...
Bug: 16894195
Needs more work and soak time
Change-Id: I8d38492b32780f5bba8a3439bfe3dbd30da3811c
2014-08-08 18:29:18 +00:00
RoboErik
6d9fe654b5
Merge "Combine MediaSession Callback and TransportControlsCallback" into lmp-dev
2014-08-08 17:26:08 +00:00
Ji-Hwan Lee
fcbbd00050
am 001c9ab3: Merge "TIF: Make TvContract URI consistent" into lmp-dev
...
* commit '001c9ab3ff333e810404f5677a02f3ad684ea766':
TIF: Make TvContract URI consistent
2014-08-08 17:19:21 +00:00
RoboErik
67098d0963
Unhide MediaMetadata.Description
...
This unhides the method and inner class for getting a small version
of the metadata for display.
Change-Id: I22f484cecd5f0630ac22bb648baad842d211d135
2014-08-08 17:16:37 +00:00
Ricardo Cervera
0495f1ef71
docs: Fixed minor issue with Studio shortcuts
...
See https://code.google.com/p/android/issues/detail?id=74316
Updated keymap for new files and added note on choosing keymaps.
Change-Id: I3c1e1a8ab0f344040ea2627734f7d5959c842799
2014-08-08 09:31:13 -07:00
Andy Hung
f99a1c3a30
am b0b521ea: Update exception handling for MediaCodec
...
* commit 'b0b521eabde47301d1ff6d5b14ef54ffcdf24cdf':
Update exception handling for MediaCodec
2014-08-08 16:23:28 +00:00
Andy Hung
5f9aa0bcea
Update exception handling for MediaCodec
...
Throw MediaCodec.CodecException (versus IllegalStateException).
Print out status error codes as found (See MediaError.h for details).
Update error code mapping to CryptoException.
Bug: 12034929
Bug: 13976475
Change-Id: I23b951cb06807413f087c238a1d3526659f06e7b
2014-08-08 16:15:07 +00:00
Winson Chung
4f70cacd45
Merge "Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)" into lmp-dev
2014-08-08 16:09:03 +00:00
Winson Chung
e9217a0729
Exposing taskDescription for apps to read from their own AppTasks. (Bug 16826622)
2014-08-08 11:27:41 -07:00
Alan Viverette
0df0e19f29
Merge "Don't make ripples respond to selection state" into lmp-dev
2014-08-08 16:09:03 +00:00
Alan Viverette
dbcbca4475
Don't make ripples respond to selection state
...
Also exports view pressed state for hierarchyviewer.
BUG: 16622634
Change-Id: I754428dd1d59f3b7450b01976a73d5151d27152e
2014-08-08 12:23:41 -07:00
Guang Zhu
4ed52ab752
Merge "freeze screen rotation during memory and app launch test" into lmp-dev
2014-08-08 16:09:03 +00:00