10551 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
Alan Viverette
4d5c20c613 Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev 2015-05-06 17:24:31 +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
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
Benjamin Franz
94fb2024b0 Merge "Rename functions that disable status bar and keyguard" into mnc-dev 2015-05-06 15:16:20 +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
Selim Cinek
6329bbceeb Merge "The voice assist may now be launched above the lockscreen" into mnc-dev 2015-05-05 23:52:35 +00:00
Selim Cinek
e70d653523 The voice assist may now be launched above the lockscreen
A possibility was introduced to launch voice assist over
the lockscreen using the left keyguard affordance.

Change-Id: Ic4618d24256b65441a50d77d0ef59b0ec99b6ead
2015-05-05 14:52:52 -07:00
Harish Mahendrakar
34265cd94f media: Added MPEG2 profile/levels and tests
Bug: 20852831
Change-Id: I172f2f08c30d12bf684f32a52db64823cc286d35
2015-05-05 11:05:22 -07:00
Alan Viverette
261208e002 Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev 2015-05-05 16:50:29 +00:00
Alan Viverette
c1d527926e Add API for obtaining changing configurations bitmask from Theme
Required to know when to reload the system context's theme in response
to configuration changes, and thus needed to support the DayNight theme.

Bug: 20267825
Change-Id: I7df5e28b7a6d8b611ea030032544cf4800788514
2015-05-05 09:49:03 -07:00
Todd Kennedy
3266f60ba0 Merge "Call Activity#onAttachFragment()" into mnc-dev 2015-05-05 15:53:29 +00:00
Svet Ganov
4a64b19f23 Merge "Permission UI - legacy apps support" into mnc-dev 2015-05-05 15:34:10 +00:00
Svet Ganov
019d230499 Permission UI - legacy apps support
Change-Id: Id3f98c138422d33868363d587dd196898b42a0d4
2015-05-05 08:33:04 -07:00
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
2015-05-05 01:06:38 +00:00
Andre Eisenbach
ab2581398c BluetoothSap class should not be public
Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67
2015-05-04 23:20:28 +00:00
Todd Kennedy
434bd65ca6 Call Activity#onAttachFragment()
This was accidentally removed during the changes to abstract a Fragment host.
Also ensure Fragment#onInflate(Activity) gets invoked

Bug: 20825263
Change-Id: I981266ae1e8817db5c82ec4609bbcf4a5e676fee
2015-05-04 14:00:38 -07:00
Jose Lima
5551aca2b8 Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev 2015-05-04 16:29:30 +00:00
Matthew Williams
303650c9cd Add full backup criteria to android manifest
BUG: 20010079
Api change: ApplicationInfo now has a fullBackupContent int
where -1 is (off) 0 is (on) and >0 indicates an xml
resource that should be parsed in order for a developer
to indicate exactly which files they want to include/exclude
from the backup set.
dd: https://docs.google.com/document/d/1dnNctwhWOI-_qtZ7I3iNRtrbShmERj2GFTzwV4xXtOk/edit#heading=h.wcfw1q2pbmae

Change-Id: I90273dc0aef5e9a3230c6b074a45e8f5409ed5ce
2015-05-03 16:19:27 -07:00
Jose Lima
4fdcc184e6 Move ContentInfoExtender from Notification.java to a support library
Bug: 20643107

Change-Id: Idabd8b0ceb4b3c63584296736e0a5015511659e7
2015-05-01 18:32:26 -07:00
Raph Levien
5c26876304 Merge "Expose StaticLayout.Builder publicly" into mnc-dev 2015-05-02 00:42:18 +00:00
Raph Levien
531c30c62b Expose StaticLayout.Builder publicly
Expose the new Builder pattern for creating StaticLayout. This allows
access to a number of features that have been available to TextView
through a hidden constructor. Some of these features have existed
for a while (mostly maxLines), while others are new (breakStrategy,
indents).

The builder is cleaner and has a better upgrade path than the old
pattern of lots of constructors with varying numbers of arguments.

Bug: 20190561
Change-Id: Ia3cd124825ab0cb469d22d1fc576ad26454545b8
2015-05-01 15:15:48 -07:00
Jorim Jaggi
0629a5d524 Merge "Rename supportsAssistGesture to supportsAssist" into mnc-dev 2015-05-01 20:34:22 +00:00
Jorim Jaggi
5f560d0562 Rename supportsAssistGesture to supportsAssist
Bug: 20642759
Change-Id: Idddc786980244cc94570d04fd414540bbad60448
2015-05-01 13:33:38 -07:00
Andrew Lee
f3280041f0 Merge "Add Properties to Call.Details." into mnc-dev 2015-05-01 18:27:23 +00:00
Dan Sandler
9fc943d1a6 Merge "Icon: a clean, parcelable place for images." into mnc-dev 2015-05-01 17:57:14 +00:00
Dan Sandler
b9f7aac348 Icon: a clean, parcelable place for images.
Binder APIs which wish to consume Bitmaps *and* drawable
resources can now do so by using Icon, a kind of union type
that accommodates each of these. Icon also accepts byte
arrays holding compressed Bitmaps (PNG, JPEG, etc), which
saves clients the additional memory cost of decoding and
sending full uncompressed bitmaps through Binder interfaces.
Receiving clients can call loadDrawable{,Async} and then
getDrawable to start immediately using the image in an
ImageView or other Drawable-hosting container.

Bug: 19609468
Change-Id: Ic1343711c2ac0b15876b46f0b6008b0108a49470
2015-05-01 13:44:42 -04:00
Prerepa Viswanadham
b6f9da0b7f Merge commit '17455a3' into master_merge 2015-05-01 10:12:11 -07:00
Prerepa Viswanadham
971cd2b952 Merge commit 'eba66c3' into master_merge 2015-05-01 10:10:22 -07:00
Amit Mahajan
13a98b6c6e Support for bearer_bitmask.
Change-Id: I7cae3d229445607c66b6472124264588f7571097
2015-05-01 16:40:56 +00:00
Lorenzo Colitti
0c12125e00 am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* commit 'ad44d81457971085a0b20fb42388010d76c79132':
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
2015-05-01 04:19:07 +00:00
Lorenzo Colitti
b57f236e30 Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* changes:
  Add a hidden method to clear NetworkCapabilities.
  Fix javadoc error for requestNetwork.
  Simplify network callback handling code.
  Document and unhide CALLBACK_PRECHECK.
2015-05-01 03:45:14 +00:00
Lorenzo Colitti
0708693f1e Document and unhide CALLBACK_PRECHECK.
Bug: 20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
2015-05-01 12:36:28 +09:00
Andrew Lee
10821f9920 am c493f43f: am 972e0c7b: am 5b8b0df7: Merge "Add handler parameter for callbacks." into mnc-dev
* commit 'c493f43fe1f0b7b1ed62ae85065d7c8f66803273':
  Add handler parameter for callbacks.
2015-05-01 01:34:19 +00:00
Todd Kennedy
6b379c8a34 am 9c14b3ab: am c7e9a17a: am 10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev
* commit '9c14b3ab0d6e42031d0465114a979b644c6890d2':
  Remove dependency upon FragmentActivity
2015-05-01 01:32:25 +00:00
Andrew Lee
2378ea76d4 Add Properties to Call.Details.
Moved some capabilities to properties which seemed appropriate.

Bug: 20160395
Change-Id: Iacef4365822e5c3e50f0c41a501bf295c22055f1
2015-04-30 17:21:10 -07:00
Mady Mellor
d274400205 resolved conflicts for merge of 04f2fe39 to master
Change-Id: I9cd9efb3ead33cef9a0de95417d71d535cbc1bce
2015-04-30 16:17:16 -07:00
Alan Viverette
80ebe0d4ec ListPopupWindow should use window layout type SUB_PANEL
Look down, back up, where are you? You're in a dialog with an
AutoCompleteTextView. What's on your screen? I have it, it's the
auto-completion results you could be seeing. Look again. The window
layout type is now TYPE_APPLICATION_SUB_PANEL and the auto-completion
results are visible.

Also adds API on ListPopupWindow to specify the window layout type
and changes the text editing handle to be type ABOVE_SUB_PANEL.

Bug: 18530738
Change-Id: Id5577c4892729920de5b73411e580e6b2b2401d0
2015-04-30 15:53:11 -07:00
Andrew Lee
011728fc3a Add handler parameter for callbacks.
Bug: 20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
2015-04-30 15:24:50 -07:00
Todd Kennedy
a5fc6f006f Remove dependency upon FragmentActivity
The FragmentManagerImpl is intimately tied with a FragmentActivity. In
many cases, we want to be able to create / manage Fragments outside of
a FragmentManager. This defines a FragmentController interface that can
be used by any class to host Fragments.

Bug: 19569654
Change-Id: I6816a5c1815122d206062b9f4584ad460b3d41dd
2015-04-30 12:52:32 -07:00
Mady Mellor
e82067b575 Add onStylusButtonPress listener to View
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.

If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.

Bug: 19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
2015-04-30 09:58:35 -07:00
Jim Miller
b62dc82b0c Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
Fixes bug 20660180

Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
(cherry picked from commit 0ecd5c20d93c24251975f3ff7cb0494039e5ea20)
2015-04-30 01:53:11 +00:00
Alex Klyubin
83bd0088e1 Merge "Add javax.crypto.Mac as a supported CryptoObject to Fingerprint" 2015-04-30 01:52:40 +00:00
Jim Miller
0ecd5c20d9 Add javax.crypto.Mac as a supported CryptoObject to Fingerprint
Fixes bug 20660180

Change-Id: I421c246ef776847835ede4be1d72721c35cf951c
2015-04-29 18:51:19 -07:00
Maxim Bogatov
aba56b648f Merge "Add accessibility actions for scrolling in different directions" 2015-04-30 01:16:02 +00:00
Miao Wang
d0a4020223 am 4ea4af04: am 5545d518: am 508a2870: Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev
* commit '4ea4af0464c3782f10e78aa8af5f59e1b752fc22':
  [RenderScript] Enable L2 BLAS APIs
2015-04-30 00:42:27 +00:00
Miao Wang
5457c167c0 am 6c57c327: am e2341e2b: am 634160a0: Merge "[RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex \'Alpha\' and \'Beta\'" into mnc-dev
* commit '6c57c32708ccc6bb071f78e1c3756f6a4edc7459':
  [RenderScript] Fix HEMM and SYRK in IntrinscBLAS to correctly handle complex 'Alpha' and 'Beta'
2015-04-30 00:42:16 +00:00
Alex Klyubin
ee4bd11c4c am 8fa0eecc: am 789d9dc7: am 33c9dde9: Merge "Add KeyPermanentlyInvalidatedException." into mnc-dev
* commit '8fa0eecc4fa569fe89273ddb3234f03bf1c567ec':
  Add KeyPermanentlyInvalidatedException.
2015-04-30 00:27:21 +00:00
Miao Wang
508a2870e9 Merge "[RenderScript] Enable L2 BLAS APIs" into mnc-dev 2015-04-30 00:07:30 +00:00