191416 Commits

Author SHA1 Message Date
Adam Powell
2ed547e55f Add alternate intents and refinement callbacks to ChooserActivity
Allow a calling app to supply an array of additional Intents to the
system ChooserActivity.

The chooser will present a merged list of targets that can handle any
of the Intents supplied, including both the standard EXTRA_INTENT as
well as any of the intents supplied in EXTRA_ALTERNATE_INTENTS. These are
treated as ordered; EXTRA_INTENT is considered the first/primary
Intent and EXTRA_ALTERNATE_INTENTS are sorted most important first.

Targets are queried for all supplied Intents. If the same component is
returned for more than one Intent, the target is associated with the
most important Intent that matched.

This allows calling apps to supply several different payloads for an
action depending on what the intended targets are able to support. For
example, an app performing ACTION_SEND may supply image/jpeg data to
compatible targets or a hosted web link to targets that only support
text/plain. The user will have the opportunity to pick from a single
merged list of choices using the best available payload, and will not
be bothered with the implementation details of how the payload will be
delivered to the recipient.

If the calling app wishes to provide further disambiguation or
refinement after the user makes a choice, for example to let the user
choose which of the source intents to send from the primary or
alternates, show a progress dialog as a full-resolution version of a
photo is downloaded from the server before being sent along or while
reticulating splines, the caller can supply an IntentSender to
ACTION_CHOOSER including the extra EXTRA_REFINEMENT_INTENT_SENDER.
This should be the IntentSender obtained from a PendingIntent pointing
at an activity to launch to perform the refinement.

The refinement activity should report that it is finished by obtaining
the ResultReceiver from EXTRA_RESULT_RECEIVER. Available intents to
send to the selected target will be contained in EXTRA_INTENT and
EXTRA_ALTERNATE_INTENTS.

To complete the refinement and send the result along to the chosen
target, the refinement activity should select one of the supplied
intents and send it to the ResultReceiver in a Bundle with the key
EXTRA_INTENT and the result code RESULT_OK. To cancel the refinement,
and let the user select another choice, send RESULT_CANCEL.

While refinement activities cannot modify the filterEquals-affecting
fields of the Intent they return, they may modify extras to provide
additional or altered details to the final recipient. These extras
will be filled into the Intent sent to the final target.

Change-Id: I7ad4739eadd1a0e307675847ccf47ea948918a3a
2015-05-06 13:23:36 -07:00
Christopher Tate
a1d3c508e1 Merge "Fix requestRestore() of an app's own package" into mnc-dev 2015-05-06 19:41:40 +00:00
Jason Sams
22f07f89df Merge "Fix Allocation-less launches" into mnc-dev 2015-05-06 19:40:21 +00:00
Tim Murray
a0511081d0 Merge "Add loop option to hwuitest." into mnc-dev 2015-05-06 19:31:48 +00:00
Christopher Tate
5aba226d8a Fix requestRestore() of an app's own package
The BACKUP permission check was being applied over-zealously.

Bug 19336200

Change-Id: Ia52b5c5cc0fd8d19b74ee624be85113d1b8dca7e
2015-05-06 12:31:46 -07:00
Tim Murray
1a0f1c7c16 Add loop option to hwuitest.
Change-Id: I15b6b121bd6bd963e5b433bdd93d6dc3e83645b8
2015-05-06 12:22:35 -07:00
Chris Wren
9260cb7ffe Merge "count panel open method" into mnc-dev 2015-05-06 18:34:47 +00:00
Matthew Williams
8b76d20c71 Delay all syncing until the device is provisioned
BUG: 20185340
Add ContentObserver to be notified when device provisioned
system setting bit is flipped. Stash all messages that come
along before then, similar to how we were doing it for
onBootCompleted, and fire them off when ready.

Change-Id: Ied9fe2262b2a96ea3316b6dd7c57e23628e19581
2015-05-06 11:24:35 -07:00
Eric Laurent
b65cd17b05 Merge "Implement audio routing callbacks" into mnc-dev 2015-05-06 17:51:53 +00:00
Alex Klyubin
6223ec129b Merge "Keystore uses 0 for invalid operation handles." into mnc-dev 2015-05-06 17:26:11 +00:00
Alan Viverette
809d5d7fbe Merge "DayNight theme for framework packages" into mnc-dev 2015-05-06 17:25:26 +00:00
Alan Viverette
4d5c20c613 Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev 2015-05-06 17:24:31 +00:00
Jeff Tinker
26d955fd02 Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev 2015-05-06 17:22:35 +00:00
Alex Klyubin
9cfc428a24 Keystore uses 0 for invalid operation handles.
This propagates the concept that 0 is an invalid crypto operation
handle to the outside of AndroidKeyStore abstraction.

Bug: 20864436
Change-Id: I1e5abb66c5d41d8fc32aac44372495a708c2b6e2
2015-05-06 10:16:57 -07:00
Alan Viverette
71b0cb043f Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev 2015-05-06 17:11:24 +00:00
Alan Viverette
922e1c6ed2 Add scroll indicators on View, use in AlertDialog
Also updates default fade duration for scrollbars to match Material
spec and moves around some padding in AlertDialog so that scrolling
text and list items aren't so close to the title.

Bug: 19098033
Change-Id: I40dca6a931480c4c48463e3ea5b8361534cbd8d7
2015-05-06 10:09:35 -07:00
Eric Laurent
4bcdba8484 Implement audio routing callbacks
Implement JNI for AudioTrack and AudioRecord routing
callbacks:
- Added files core/jni/android_media_DeviceCallback.cpp/.h
for JNI callback implementation used by both AudioTrack
and AudioRecord.
- Made AudioManager AudioPort and AudioPatch methods static
in order to call them without context.

Also added IO handle information to AudioMixPort.

Change-Id: Icee182aa68310d4b12fd1469f48e78110889acf1
2015-05-06 17:03:50 +00:00
Alan Viverette
c97b922aba Merge "Fix setting hotspot bounds in a drawable container" into mnc-dev 2015-05-06 16:58:09 +00:00
Chris Wren
49f06f5f0d count panel open method
open panel
  open with two fingers
  open via peek
  pull down to open QS
  tap to open QS

Bug: 20262922
Change-Id: I7eaa8a6de75867035c64a3ac939cec86daaab913
2015-05-06 12:57:55 -04:00
Alexander Martinz
27cf86939d Fix setting hotspot bounds in a drawable container
We are passing the wrong parameters for setting hotspot bounds.
Bottom and right are in the wrong order, correct it.

Change-Id: I2762fc3a4c29f05ba8b7e71a5c6cad0be16c2ae0
2015-05-06 09:55:49 -07:00
John Reck
add70268b1 Annotate Application with @CallSuper
Bug: 19844784
Change-Id: I12431ed65edd0076e1231ba6ebcff479580370c4
2015-05-06 09:44:53 -07:00
John Spurlock
444eda0836 Merge "Zen: Calendar tracker should use event availability." into mnc-dev 2015-05-06 16:21:59 +00:00
Tyler Gunn
ed7cbf111f Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev 2015-05-06 16:01:36 +00:00
Tyler Gunn
4538216a31 Change sendSessionModifyRequest VideoProvider API signature.
Including a fromProfile in addition to the requestedProfile.

- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState.  This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
  - Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.

Bug: 20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
2015-05-06 08:52:27 -07:00
John Spurlock
028a53977c Zen: Calendar tracker should use event availability.
- Ignore events that are marked as availability=free for consideration
   as DND trigger events.  All-day events are conventionally marked
   as free by default.

Bug: 20064962
Change-Id: Ie26c81a6b79bdd86444092886f9bc123470575a7
2015-05-06 11:36:19 -04:00
Benjamin Franz
94fb2024b0 Merge "Rename functions that disable status bar and keyguard" into mnc-dev 2015-05-06 15:16:20 +00:00
Brian Colonna
0fb5aa656e Merge "Removed unused Face Unlock string" into mnc-dev 2015-05-06 14:37:23 +00:00
Benjamin Franz
bece80645e Rename functions that disable status bar and keyguard
Rename the DevicePolicyManager functions setKeyguardEnabledState and
setStatusBarEnabledState to setKeyguardDisabled and
setStatusBarDisabled respectively.

Bug: 20820039
Change-Id: I06f6a19ac55b24e66e9f2cb340ead5d940cb2235
2015-05-06 13:19:22 +01:00
Clara Bayarri
fbb34dd8df Merge "Allow Floating ActionModes in SearchDialog." into mnc-dev 2015-05-06 09:10:27 +00:00
Alan Viverette
7f76ff39b7 Merge "Fix checkbox animation end colors" into mnc-dev 2015-05-06 03:55:38 +00:00
Sanket Padawe
56cfbfb031 Saved network summary string fixes in Wifi Settings
Bug: 20667217
Change-Id: Ife1b1e7da3270020ef405693252a9e8a1ea5a6ca
2015-05-05 20:10:46 -07:00
Adam Lesinski
c9399a8044 Merge "Fix overcounting of mobile radio" into mnc-dev 2015-05-06 02:21:16 +00:00
Adam Lesinski
d9b48d5735 Fix overcounting of mobile radio
Bug:20438089
Change-Id: Ie8987cf61ef7a0cecab6d730eed7bc47eabb9eec
2015-05-05 19:19:19 -07:00
Rich Slogar
f1ca577728 am 34e0f640: am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '34e0f6401e66df33ec71df7f76196bbe0eca3183':
  docs: gradle multidex update
2015-05-06 01:24:46 +00:00
Rich Slogar
8bbbbd2afd am b462da9e: am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit 'b462da9e3d554deb9ba5b8ca58d5d66797fb54d5':
  docs: overview link to release notes
2015-05-06 01:24:41 +00:00
Rich Slogar
c98d6ae334 am 48ea7762: am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '48ea7762295cdf3e2bd61dafd55422a0d6bee5e6':
  docs: translation editor update
2015-05-06 01:24:33 +00:00
Rich Slogar
5464b5ca62 am cc4a2980: am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit 'cc4a29807e679a1691a949c117f540867304acc7':
  docs: memory monitor duplicate paragraph
2015-05-06 01:24:27 +00:00
Rich Slogar
34e0f6401e am 84a67c7d: am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '84a67c7db75edc192a8975637c99c9a917796ff1':
  docs: gradle multidex update
2015-05-06 01:14:31 +00:00
Rich Slogar
b462da9e3d am f0ea8f9f: am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit 'f0ea8f9f1e1ede23f954cade5ee4a84e92d28943':
  docs: overview link to release notes
2015-05-06 01:14:26 +00:00
Rich Slogar
48ea776229 am 7e33aa48: am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '7e33aa4843edbc037659023cff98dd44ac90d44c':
  docs: translation editor update
2015-05-06 01:14:21 +00:00
Rich Slogar
cc4a29807e am ffef3b76: am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit 'ffef3b76762ae32c3a6fca00fa9cbdd1230f6f83':
  docs: memory monitor duplicate paragraph
2015-05-06 01:14:08 +00:00
Rich Slogar
138ab38141 am e12c404a: am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit 'e12c404a07037d214c7f1f83d993ce9dba95e47b':
  docs: providing resources link
2015-05-06 01:13:28 +00:00
Nicolas Prevot
95778ffc58 Fetch DISALLOW_CONFIG_VPN for the current user.
The code did not specify the user in which to fetch the value
of the restriction DISALLOW_CONFIG_VPN. Since it was called
from the vpn service which lives in user 0, it would always fetch
the value for user 0.

BUG: 18902920

Change-Id: I89419976a8edcaa86ac8e545c64d10818cd42ddd
2015-05-06 02:10:07 +01:00
Jason Sams
d1516dffa8 Fix Allocation-less launches
Cherry-pick fix from AOSP.  Error check for kernel launch was
generating a false positive.

bug 20690242


Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
2015-05-05 18:00:34 -07:00
Rich Slogar
84a67c7db7 am 1b5f692d: am 9b4d57e1: Merge "docs: gradle multidex update" into lmp-docs
* commit '1b5f692d853cf5e873dbe4eb93c34e3fcdbb02ed':
  docs: gradle multidex update
2015-05-06 01:00:16 +00:00
Rich Slogar
f0ea8f9f1e am f77d64dc: am 2f14c38f: Merge "docs: overview link to release notes" into lmp-docs
* commit 'f77d64dca71e9a11de3f234ce686692dae9d92ed':
  docs: overview link to release notes
2015-05-06 01:00:12 +00:00
Rich Slogar
7e33aa4843 am 96d00bb6: am 37ca7773: Merge "docs: translation editor update" into lmp-docs
* commit '96d00bb64c8dc9fb85f1f2ecb894930d3eacd0d5':
  docs: translation editor update
2015-05-06 01:00:08 +00:00
Rich Slogar
ffef3b7676 am 39b51b49: am 2febf6e0: Merge "docs: memory monitor duplicate paragraph" into lmp-docs
* commit '39b51b4968c0aeeef84d5d75ef683516e658a30d':
  docs: memory monitor duplicate paragraph
2015-05-06 01:00:04 +00:00
Rich Slogar
e12c404a07 am 35d7cd40: am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit '35d7cd40bb167ee08bbb855195eb395e77a05b7a':
  docs: providing resources link
2015-05-06 00:58:49 +00:00
Rich Slogar
35d7cd40bb am d0551fee: Merge "docs: providing resources link" into lmp-mr1-ub-docs
* commit 'd0551feed28614dad957a09998522b25392ce621':
  docs: providing resources link
2015-05-06 00:50:57 +00:00