142245 Commits

Author SHA1 Message Date
Barnaby James
d3fdb8bed8 Add VoiceInteraction request type for successful actions.
Add CompleteVoiceRequest to VoiceInteractor to allow apps to indicate when a voice interaction was successfully completed.

Change-Id: I1481cfe96e9e2495d88a7a4fb62263bdd1e03c54
2014-07-11 10:34:50 -07:00
Yohei Yukawa
ca249dc634 Merge "Fix SDK build breakage" 2014-07-10 21:52:20 +00:00
Jean-Michel Trivi
998ff75484 fix build: hide AudioAttributes.usageToString() method
Change-Id: I1041d9bf530df45878dd61e30e32f5a2f4f9d1a1
2014-07-11 10:01:00 -07:00
Yohei Yukawa
69684533cd Fix SDK build breakage
This should have been included in I3c6b69bd9d79b199afe68d838f25effa6

BUG: 15812658
BUG: 16118603
Change-Id: I298206008fc28faa4f6576a77d56251f873f233c
2014-07-12 01:59:07 +09:00
Svetoslav
15cbc8a032 Addressing comments for the print preview feature.
Change-Id: Ib72140a912e22f859258d970e0d1c4ef06e807d5
2014-07-11 16:46:46 +00:00
Narayan Kamath
398b6c26c3 Fix an abi <-> instructionSet mixup.
We should be calling is64BitInstructionSet and
not is64BitAbi.

Change-Id: I5b099af19f1d7409f65f63493d3f13a830f4fb5d
2014-07-11 16:38:20 +00:00
Amith Yamasani
6b58d328b7 Merge "Fix apparent delay in removing a managed profile" 2014-07-10 21:14:09 +00:00
Amith Yamasani
70fcf0c75f Fix apparent delay in removing a managed profile
Bug: 15268575

When returning the list of profiles, don't include dying users.

Change-Id: Ifeaed5c7c2b93922cddea22057dd890a1b3750fc
2014-07-11 08:41:52 -07:00
Narayan Kamath
4d8c132609 Allow 3 letter language codes in InputMethodUtils.
Replace locale.substring(0, 2) with a function that always
returns the first component of the locale (assumed to be the
language).

bug: 10090157
Change-Id: Ibb9eb9f65323795d139b16d76b7e7e36a4e0568c
2014-07-11 15:37:08 +00:00
Jorim Jaggi
fb98a5023e Fix weird state when tracking and pressing back
Bug: 10934514
Change-Id: I60bbd6005e664033ed22c87b404ddc918e5f2c0e
2014-07-11 15:28:58 +00:00
John Spurlock
be8df5aea8 Merge "Volume: delay dismissing panel when starting settings." 2014-07-10 21:35:02 +00:00
John Spurlock
1dad272337 Volume: delay dismissing panel when starting settings.
Bug:16211952
Change-Id: I067721d932076dafb35c6afd99583301acff9bea
2014-07-11 11:07:53 -04:00
Yuncheol Heo
d05f67f972 Handle <Feature Abort> after <System Audio Mode Request>.
- Fix some wrong return values.

Bug: 15841647
Change-Id: Ia4596e87204196b48429d55da4945f84de51a07b
2014-07-11 20:07:50 +09:00
Yohei Yukawa
04dc9953b4 Merge "Add simple InputMethodSubtypeTest" 2014-07-10 21:52:20 +00:00
Yohei Yukawa
638e4787ba Add simple InputMethodSubtypeTest
Change-Id: I87105c4935adfca249378e667161d2998cf77840
2014-07-11 19:51:19 +09:00
John Spurlock
caebf6ff00 Merge "QS: Recenter feedback for non-dual tiles." 2014-07-10 21:35:02 +00:00
John Spurlock
529aa73af2 QS: Recenter feedback for non-dual tiles.
And dial the radius down a bit.

Bug:15168179
Change-Id: I946c556b6c31a74a526368097c5c16a7ddbc9749
2014-07-10 22:49:16 -04:00
Jungshik Jang
7468f1db0a Merge "Revamp HDMI-CEC system audio mode integration with audio service." 2014-07-10 21:52:20 +00:00
Jungshik Jang
6f34f5ab8a Revamp HDMI-CEC system audio mode integration with audio service.
In previous change we use setForceUse(FORCE_MEDIA, XXX) method
in order to set specific audio output type, such as LINE, HDMI_ARC,
and SPDIF. But it turns out that it conflicts with bluetooth
a2dp which uses the same setForceUse(FORCE_MEDIA, yyy).

This change is based on several conditions.

1. When other non-speaker devices are on, prevent system audio
   from turing on.
2. In order to keep track of other devices' connectivity and to
   turn off system audio if other device like bluetooth or
   headphone preempts current output, register OnAudioPortChangeListner
   to audio manager.
3. All possible system audio outputs can be merged with other
   outputs without priority.

Change-Id: Id4e47d99db64b9f77a17c2c28c47787ab8980bf7
2014-07-11 08:07:12 +09:00
Raph Levien
b249225456 Fix BCP47 language tags in fallback_fonts.xml
The BCP47 tag we use for selecting Simplified vs Traditional Chinese is
Hans and Hant. This patch uses those tags in fallback_fonts.xml rather
than country names, which weren't getting matched.

Change-Id: I97e1da7b86e8fe8f026365146393304a5ab74443
2014-07-10 22:57:51 +00:00
Jinsuk Kim
f9e44ea716 Merge "Update HdmiControlService JNI to the change in HAL definition" 2014-07-10 21:46:42 +00:00
John Spurlock
f84a1b87c7 QS: Enable wifi entering detail (if disabled).
Bug:16215297
Change-Id: I3cf2b7fadec0b10aeb894db5dc0b92d8b83511f7
2014-07-10 22:23:38 -04:00
Jinsuk Kim
284c31b92e Update HdmiControlService JNI to the change in HAL definition
Change-Id: Iab235785c4d0242ab5845d1f8ad62d78770ff9c4
2014-07-11 07:26:45 +09:00
Tyler Gunn
2db72ad45b Adding call capabilities to indicate whether call supports VT.
Bug: 16213105
Change-Id: Icb05d3f0f6bd90b2c45bdfb7b199f38aaecc16ca
2014-07-10 21:52:20 +00:00
Jean-Michel Trivi
e3dfa2821f Merge "Define audio policy, mixes, and mixing rules" 2014-07-10 20:54:59 +00:00
Jean-Michel Trivi
a8b6bd88cf Define audio policy, mixes, and mixing rules
An AudioMixingRule is a collection of AudioAttributes and match/exclude
   rules.
An AudioMix is defined by its AudioMixingRule, AudioFormat and
   routing flag.
An AudioPolicyConfig is a collection of AudioMix and is
   parcellable.
An AudioPolicy has an AudioPolicyConfig, and
   can be registered/unregistered through AudioManager.

bug 16009464

Change-Id: I01bf95d014967f48ba823648ea897779da099e5d
2014-07-11 09:10:46 -07:00
Yohei Yukawa
4267dbea26 Merge "Use a bit more descriptive name for a parameter" 2014-07-10 21:43:01 +00:00
Yohei Yukawa
bb9f624252 Use a bit more descriptive name for a parameter
The current parameter name "index" in
CursorAnchorInfo.Builder#setComposingText is a bit hard
to understand.

This CL names it with "composingTextStart" to clarify its usage.

Change-Id: I504939b8d2b48875d8baa9630b5a4f04a5d66dbe
2014-07-12 01:11:45 +09:00
Paul Jensen
1397751c7f Merge "Define NETID_UNSET in ConnectivityManager." 2014-07-10 21:21:20 +00:00
Paul Jensen
bcc76d345c Define NETID_UNSET in ConnectivityManager.
This allows some cleanup and removal of dead code.

bug:15489928
Change-Id: Iaf0507bc2e8ec6dcc253f01f61c5b221d46581f9
2014-07-11 12:00:10 -04:00
Alan Viverette
4c33b9f7d4 Merge "Remove material progress drawable" 2014-07-10 20:54:59 +00:00
Alan Viverette
d7f4a3cdd7 Remove material progress drawable
BUG: 16138805
Change-Id: If8a8981e6ce741d563e870e3c09cbb5f39d30ac9
2014-07-10 15:48:37 -07:00
Sreeram Ramachandran
482edab3ab Merge "Allow a VPN to be declared bypassable." 2014-07-10 20:54:59 +00:00
Sreeram Ramachandran
a9294eb1c9 Allow a VPN to be declared bypassable.
A VPN declared bypassable allows apps to use the new multinetwork APIs to
send/receive traffic directly over the underlying network, whereas without it,
traffic from those apps would be forced to go via the VPN.

Apps still need the right permissions to access the underlying network. For
example, if the underlying network is "untrusted", only apps with
CHANGE_NETWORK_STATE (or such permission) can actually use it directly.

New API with stub implementation to be filled out later.

Bug: 15347374
Change-Id: I8794715e024e08380a43f7a090613c5897611c5b
2014-07-10 14:44:27 -07:00
Christoph Studer
1d599da842 NotificationListenerService API: Avoid unnecessary allocations
Instead of producing Ranking objects, RankingMap just populates
them now, allowing developers to re-use objects and avoid
unnecessary allocations.

Also rename isInterceptedByDnd() to meetsInterruptionFilter(),
since DND is not a concept anymore.

Bug: 15415840
Bug: 16099064
Change-Id: If9861cbdf14593e641a4d4ffd1b967647eb8e2b8
2014-07-10 21:37:56 +00:00
destradaa
1c52d02679 Merge "Mark FLP constants as public, so they can be consumed by geofencing." 2014-07-10 21:14:09 +00:00
Sreeram Ramachandran
633f0e875d Let VpnService specify a white/black list of apps that are allowed access.
New API with stub implementation to be filled out later.

Bug: 13651397
Change-Id: Ibabd6c22495ce58dc88142bb958c1ef12adcf78e
2014-07-10 21:33:58 +00:00
Jorim Jaggi
1e2554b997 Implement two-finger pull down to QS.
Bug: 14590707
Change-Id: I7f88a5b26e88c79e19d4e6c7f4cc8277ffcb2d57
2014-07-10 21:30:52 +00:00
Erik Pasternak
b9731a1026 Merge "Revert "Make PlaybackState immutable with a builder"" 2014-07-10 20:43:36 +00:00
Erik Pasternak
b2e93efcac Revert "Make PlaybackState immutable with a builder"
Will resubmit tomorrow for Build Breakage Friday as this change needs new SDK prebuilts for unbundled app branches.

This reverts commit aa746b27610680a2c0fbdf7d81a6455c4597f05e.

Change-Id: I28ba7e1b09234a5eb1b725aed043b9de98e1bc16
2014-07-10 22:51:34 +00:00
Ashish Sharma
cba1215412 Correctly attribute User Activity to the uid in checkin batterystats.
Change-Id: Iacca5985c0b5a68026da6b2b5c9607f8cb71aad5
2014-07-10 22:45:22 +00:00
RoboErik
5a4e011143 Make PlaybackState immutable with a builder
bug:15862252
Change-Id: I8944b7753cd6a36a74b0091f71a386f77040c4ab
2014-07-10 22:39:03 +00:00
Jinsuk Kim
b3d91779cb Global system settings for HdmidControlService
HDMI CEC/MHL related settings. All the settings are hidden, to be used
by the service and settings UI.

Change-Id: I1113aa5f77189db73acfa5fe36670a3cd621b1c1
2014-07-10 22:34:11 +00:00
John Spurlock
136c5ae2ce Merge "Volume: Promote alarm warning to title." 2014-07-10 21:28:08 +00:00
John Spurlock
86d04fdaa1 Volume: Promote alarm warning to title.
Bug:16211556
Change-Id: I839e08d1ba26ba825a9799f92c9b600feb91a81b
2014-07-10 18:37:45 -04:00
ztenghui
4239469bc5 Merge "Fix the render order to follow the XML file order." 2014-07-10 20:49:26 +00:00
ztenghui
8d0d24f7a2 Fix the render order to follow the XML file order.
So we put path and group into a big list, then use reflectiont to handle them
differently.

bug:16162141

Change-Id: I4c84dc952d5d9b49412301dcd6459395e21d3b31
2014-07-10 22:04:20 +00:00
Andres Morales
ef6a8cc008 Updating strings to make them more clear for TC
Bug: 15893731
Change-Id: Ib6f5591322e76a35336a62a93863c13363e30dba
2014-07-10 15:03:01 -07:00
Jinsuk Kim
17db3b8cf7 Merge "Support HdmiControlService.sendKeyEvent for both TV/playback device" 2014-07-10 21:43:01 +00:00
Jinsuk Kim
c068bb5a04 Support HdmiControlService.sendKeyEvent for both TV/playback device
Added another parameter deviceType for HdmiControlService to
run the specified local device for sendKeyEvent.

Bug: 15844076
Change-Id: I598ef320ae94bba0ace38701ae0ca12fd0625559
2014-07-11 06:59:26 +09:00