Commit Graph

10585 Commits

Author SHA1 Message Date
Alex Klyubin
86a4280fa5 am 7c97d74f: am 4230be8c: am 8d7455fb: Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev
* commit '7c97d74f1c446598427962d8017ee25d30800bd6':
  Define String constants for AndroidKeyStore crypto.
2015-05-07 19:14:57 +00:00
Alex Klyubin
8d7455fbe4 Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev 2015-05-07 17:34:01 +00:00
Neil Fuller
ee9623ff69 am 8106751d: am 192b52a4: am d6a21352: Remove FloatMath methods from the API
* commit '8106751ddc7bb7b34bd1179fe504c4c32c02abd2':
  Remove FloatMath methods from the API
2015-05-07 17:16:55 +00:00
Neil Fuller
d6a2135262 Remove FloatMath methods from the API
Also removing FloatMathTest. The tests are being
moved into a legacy CTS suite.

Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: I397fd6bcc4d988db6301245f9d47460bd6c28821
2015-05-07 13:16:18 +00:00
Jeff Brown
4cf355d209 am 37d66f3b: am 8d605030: am ee2e8fbe: Merge changes from topic \'mr\' into mnc-dev
* commit '37d66f3bccdde61517308b8d034484abbe82c36b':
  Replace WIFI_DISPLAY_SETTINGS with CAST_SETTINGS.
  Revert "Initial draft of new MediaRouter APIs."
2015-05-07 05:42:06 +00:00
Adam Powell
2c617df3b8 am 918cb6a6: am 462dc294: am cfd6e9df: Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev
* commit '918cb6a6210859573c476d7cc407f5107c2d3619':
  Add alternate intents and refinement callbacks to ChooserActivity
2015-05-07 05:39:57 +00:00
Jeff Brown
c05c1aeedf Revert "Initial draft of new MediaRouter APIs."
This reverts commit 1a937b04e6.

Bug: 20641986
Change-Id: I035d945d1561e5fc7c914aa9362635f763c83cfd
2015-05-06 16:02:21 -07:00
Alex Klyubin
4d5443f37f Define String constants for AndroidKeyStore crypto.
This defines the String enum values based on JCA standard names for
key algorithm, block mode, padding schemes, and digests. This should
make it safer to interact with AndroidKeyStore code that uses JCA
strings. This was requested by API Council.

Bug: 18088752
Change-Id: I241d9225a13b85479d0a84e49d0a98cbc77e5817
2015-05-06 15:59:56 -07:00
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
6e4b9c29f8 am 5f3f0bc9: am 2ad4206e: am 4d5c20c6: Merge "ListPopupWindow should use window layout type SUB_PANEL" into mnc-dev
* commit '5f3f0bc9b445afd297fab015f18d976eff890eb0':
  ListPopupWindow should use window layout type SUB_PANEL
2015-05-06 17:55:55 +00:00
Alan Viverette
8876e44449 am 14823d60: am 72a04431: am 71b0cb04: Merge "Add scroll indicators on View, use in AlertDialog" into mnc-dev
* commit '14823d609aa66cf2980a7be0c613897752bd332a':
  Add scroll indicators on View, use in AlertDialog
2015-05-06 17:51:09 +00:00
Tyler Gunn
f10055c554 am 2d8d052c: am 470ddf4b: am ed7cbf11: Merge "Change sendSessionModifyRequest VideoProvider API signature." into mnc-dev
* commit '2d8d052c01538b921cc9580b7b0a90dfaaf5cf19':
  Change sendSessionModifyRequest VideoProvider API signature.
2015-05-06 17:42:57 +00:00
Benjamin Franz
d4ea8f7924 am 9c400eb8: am 8fb2d472: am 94fb2024: Merge "Rename functions that disable status bar and keyguard" into mnc-dev
* commit '9c400eb8aca527c9d1fc698c8a740eafe4d58c3d':
  Rename functions that disable status bar and keyguard
2015-05-06 17:42:46 +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
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
Tyler Gunn
6259398127 Add videoStateToString on videoProvider Class.
- Got tired of looking at numerical integer videoStates, so added a new
"videoStateToString" static method, similar to how we have a
Connection#capabilitiesToString method.

Bug: 20257400
Change-Id: I39fcf413938c90e5993985f0976ad4fcce11505d
2015-05-06 01:20:48 +00:00
Cheuksan Wang
c3742881dc Update the SmsMessage.createFromPdu() API call
Deprecate the old createFromPdu(byte[] pdu) call because it just
guesses the format of the PDU. Instead, unhide the
createFromPdu(byte[] pdu, String format) call which specifies the PDU
format.

BUG: 20015718
Change-Id: I133fc17bf5af4f762fea3106e75beea58185fd5d
2015-05-06 01:18:29 +00:00
xinhe
9e44022f5f No Permission check for WiFi RTT
Bug:19918231
Change-Id: I98aea756cc15683596096e46da48efe0737ae1d1
2015-05-06 01:17:39 +00:00
Prerepa Viswanadham
d3df86e5f0 Make onlost/onfound APIs public
Change-Id: I455124478d953d652f216f71d5813782fc9633ab
2015-05-05 17:56:38 -07:00
Selim Cinek
b9040caa63 am 1762af03: am e948bfeb: am 6329bbce: Merge "The voice assist may now be launched above the lockscreen" into mnc-dev
* commit '1762af0307930942cfec3b2ad6dd7f6a8663b2b6':
  The voice assist may now be launched above the lockscreen
2015-05-06 00:45:09 +00: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
Cheuksan Wang
f657b9969d add a parameter to carrier messaging calls to request delivery status
In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:

onSendMultipartTextSms
onSendTextSms
onSendDataSms

Backward compatibility is maintained in
CarrierMessagingService.java. Third-party carrier apps implementing
the old API will continue to work.

BUG: 20224743
Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932
2015-05-05 15:24:18 -07: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
c9bc1eb4bc am 6011e549: am 9e52379a: am 34265cd9: media: Added MPEG2 profile/levels and tests
* commit '6011e5496e35205ff100a93b508d58decad7ccb9':
  media: Added MPEG2 profile/levels and tests
2015-05-05 19:24:25 +00:00
Alan Viverette
aacb91d57d am 0de8c44a: am 4a207c4f: am 261208e0: Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
* commit '0de8c44a7497d79f9e21a4713061c0e74bd5ccae':
  Add API for obtaining changing configurations bitmask from Theme
2015-05-05 19:23:43 +00:00
Todd Kennedy
19cc03a178 am 170f0406: am 2e22cec8: am 3266f60b: Merge "Call Activity#onAttachFragment()" into mnc-dev
* commit '170f0406021e7ef2d9a9735506171e2dc6e4720d':
  Call Activity#onAttachFragment()
2015-05-05 19:23:31 +00:00
Svet Ganov
b0a09de819 am 4e2029c0: am 2514a265: am 4a64b19f: Merge "Permission UI - legacy apps support" into mnc-dev
* commit '4e2029c058966f30a71b1bcea16aa65a5d7f85c4':
  Permission UI - legacy apps support
2015-05-05 19:23:20 +00: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
Tingting Wang
830e158d99 Merge "Add metadata_dirty column to ContactsContract." 2015-05-05 01:41:54 +00:00
Andre Eisenbach
0b9c3610b0 am 112f177c: am 7e66f6f4: am ab258139: BluetoothSap class should not be public
* commit '112f177c2587fc3ba36bba0f5a7a7dcbb131ef13':
  BluetoothSap class should not be public
2015-05-05 01:37:36 +00: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
Tingting Wang
03583a4ee3 Add metadata_dirty column to ContactsContract.
Add metadata_dirty column to RawContacts table, to indicate
metadata related info has been changed.

BUG 20827851

Change-Id: I45ba90bb44f1d3e66b45facd9a643fc77e876e8a
2015-05-04 16:34:58 -07: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
P.Y. Laligand
5c7773d864 Display mode switches.
Knowledge of the various modes of a display is now available to apps, and they can request a specific mode for their windows.

b/18241736

Change-Id: I8eb16ff713e878512faca3ca6662254f08a9be7f
2015-05-04 13:30:58 -07:00
Jose Lima
bf89104a3a am 57b75732: am bb9045ea: am 5551aca2: Merge "Move ContentInfoExtender from Notification.java to a support library" into mnc-dev
* commit '57b7573210750ead5c6a5d6a8ebd41d8e61636ec':
  Move ContentInfoExtender from Notification.java to a support library
2015-05-04 16:57:44 +00: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
fdaba0cb98 am ead81179: am c341c1f7: am 303650c9: Add full backup criteria to android manifest
* commit 'ead811790e11432e994260e879edc16aa4f45297':
  Add full backup criteria to android manifest
2015-05-03 23:52:19 +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
647476a27b am 86de59aa: am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev
* commit '86de59aa33e109f237e9fc25a2bcf779dc753f0c':
  Expose StaticLayout.Builder publicly
2015-05-02 01:18:00 +00:00