Commit Graph

7917 Commits

Author SHA1 Message Date
Adam Connors
fd259886cd am 23439bb9: am bab7ceaf: am d50ec637: Merge "Create DPM APIs for cross profile callerId" into lmp-dev
* commit '23439bb9f3edcd2191aff79d57018ddaf2d74847':
  Create DPM APIs for cross profile callerId
2014-07-17 21:05:08 +00:00
Nancy Chen
bb6f311835 am 3a1fed97: am 74e775a5: am 4a9b99f5: API changes to enable account selection for a call
* commit '3a1fed9733a1bd6182ba5684cc59178c61874e59':
  API changes to enable account selection for a call
2014-07-17 21:05:00 +00:00
Jae Seo
3ee4685255 am 446039d7: am 77da1b05: am f977db2e: Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev
* commit '446039d7acb0b06f3c8e00c4704e7c417393a2d5':
  TIF: Add TvInputInfo.getParentId
2014-07-17 21:04:40 +00:00
Przemyslaw Szczepaniak
9caab369fe am 90d78fa4: am 95546693: Merge "Add AudioAttributes support in the TTS." into lmp-dev
* commit '90d78fa4ec5326d0cacfa5221c6675bc28b8c9d3':
  Add AudioAttributes support in the TTS.
2014-07-17 18:23:39 +00:00
Dianne Hackborn
64cf86c96b am 2a96a389: am cf3580b0: Merge "Fix build." into lmp-dev
* commit '2a96a3890975a991cbd91e9444325b0ee879caae':
  Fix build.
2014-07-17 18:22:31 +00:00
Chulwoo Lee
a92b5d288e am 44cafdc7: am 62572cab: Merge "Pass input ID to the setup/settings activity" into lmp-dev
* commit '44cafdc73e916aa0bf6c187c2fc986947fdaa2c1':
  Pass input ID to the setup/settings activity
2014-07-17 18:22:26 +00:00
Chulwoo Lee
cf3758fa6a am 3493ee3c: am 02023167: Merge "Introduce "input_id" column to the channels table" into lmp-dev
* commit '3493ee3cc87d35a02ba1b35c3f11572c8511fb66':
  Introduce "input_id" column to the channels table
2014-07-17 18:22:22 +00:00
Dianne Hackborn
bf507a0cba am 68f35ec2: am dbec91c0: Implement issue #16330060: Inform ActivityManager about WebView...
* commit '68f35ec2d2f9950f57afa9900f16a3b29a8d55b0':
  Implement issue #16330060: Inform ActivityManager about WebView...
2014-07-17 18:22:17 +00:00
Sandeep Siddhartha
a25b93b226 am bb80d295: am aecd5383: Add recognition modes to the enrollment metadata
* commit 'bb80d295092220d204a74cca1d7d1c0fde93757b':
  Add recognition modes to the enrollment metadata
2014-07-17 18:22:07 +00:00
Alan Viverette
238673f33a am 4366255e: am bbbbb3b2: Add public attributes for TimePicker styling
* commit '4366255e3764c7e2db2221b58c9b438ac8fdc84d':
  Add public attributes for TimePicker styling
2014-07-17 18:21:59 +00:00
Ye Wen
3a3735a233 am 0353e451: Merge "Unhide new MMS API and SMS storage API (1/2)" into lmp-dev
* commit '0353e451c6ccbbce461e911162543a7c96fc5523':
  Unhide new MMS API and SMS storage API (1/2)
2014-07-17 18:15:02 +00:00
Robert Shih
ec4c43f832 am 5f48c625: MediaRecorder: added constants for WEBM output
* commit '5f48c6258ffc537454e4df9b49a3ebee652cfaee':
  MediaRecorder: added constants for WEBM output
2014-07-17 18:14:57 +00:00
Sailesh Nepal
909d1b5755 resolved conflicts for merge of 03e88771 to master
Change-Id: If55838968d008043f85a3cda1a2e0f76f357aec3
2014-07-17 11:05:42 -07:00
Nancy Chen
5da0fd5e76 API changes to enable account selection for a call
If an account default is not set, the incall ui will display a dialog to
allow the user to select an account for that particular call.

Bug: 16243703

Change-Id: I8faf2f2ce0b2669a141562832f23e8f3ce88f094
2014-07-17 10:19:20 -07:00
Shishir Agrawal
169e888524 am 38c365d0: Merge "Unhiding the SMS/MMS APIs for injection/transport." into lmp-dev
* commit '38c365d037e40385f2b25cd0fe0214c24f2f08ed':
  Unhiding the SMS/MMS APIs for injection/transport.
2014-07-17 16:45:14 +00:00
Jae Seo
874f95ca73 Merge "TIF: Add TvInputInfo.getParentId" into lmp-dev 2014-07-17 16:16:48 +00:00
Barnaby James
48f3552093 Add intents for setting airplane and zen mode by voice only.
Change-Id: I28a262da86eb102d1bd12265f96db0efec5db203
2014-07-17 07:24:09 -07:00
RoboErik
1a50e1db0e am 22ea3c3d: am b21fab77: Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev
* commit '22ea3c3ddaad1b25c05c3e6e6027747076d44750':
  Change adjustVolumeBy to adjustVolume
2014-07-17 14:13:02 +00:00
RoboErik
e1ecd82cbb am 1cd008e1: am 9b039cf8: Merge "Make MediaSession and MediaController constructors public" into lmp-dev
* commit '1cd008e1fe13b97068c3eac86b1b78ab20dca1fb':
  Make MediaSession and MediaController constructors public
2014-07-17 14:12:53 +00:00
Dianne Hackborn
fee756ff91 Implement issue #16330060: Inform ActivityManager about WebView...
...state changes.

Add a new API to tell the activity manager about a new dependency
one process has on another package.  Start using it already for
when apps is Context.createPackageContext() to load code from another
app.

Also do some work on getting the monitoring of proc/uid states
in shape so it can be used by unundled code, along with an
AppImportanceMonitor class for doing so.

Some small fixes and additions to VoiceInteractionService.

Improve handling of unaccounted/overcounted battery use so that
they aren't shown to the user unless they are significant.

Change-Id: I22dd79a73f4e70103d3f8964494aebc8a31f971c
2014-07-16 22:50:31 -07:00
Ji-Hwan Lee
66bdf247df TIF: Add TvInputInfo.getParentId
Bug: 16166859
Change-Id: I07130b6f974ca7b2527aba68b92dc31fb4b5a139
2014-07-17 14:40:31 +09:00
Sandeep Siddhartha
e6cd2476aa Add recognition modes to the enrollment metadata
This will be used by the Voice interaction service to determine what type of recognition may be run
on the DSP. e.g. If the DSP supports voice trigger only for the given keyphrase,
the voice interaction service may want to perform user identification at its end.

Also support keyphrase metadata for all keyphrases and locales.
In case the enrollment app supports open-ended keyphrases, it can leave the keyphrase text
to be empty
similarly, if the enrollment app supports all locales, it can leave the supported locales
attribute to be empty,

Change-Id: I782a17a877fc79ed569fa7c3a81697641182590b
2014-07-16 22:03:03 -07:00
Alan Viverette
5134478151 Add public attributes for TimePicker styling
BUG: 11218747
Change-Id: Ifdf981280ebe20a9066f219c9a4505d0d7486b2e
2014-07-17 04:36:11 +00:00
Chulwoo Lee
5130655bcb Merge "Pass input ID to the setup/settings activity" into lmp-dev 2014-07-17 04:18:22 +00:00
Chulwoo Lee
3b2f507910 Merge "Introduce "input_id" column to the channels table" into lmp-dev 2014-07-17 04:15:25 +00:00
Adam Connors
c8fa3ae2ce Merge "Create DPM APIs for cross profile callerId" into lmp-dev 2014-07-17 00:15:07 +00:00
Adam Connors
210fe21e95 Create DPM APIs for cross profile callerId
Contact information in the managed profile is shown
in the incoming call UI unless blocked using this API.

TODO: Actually plumb this into the caller-id logic.

Bug: 16301261
Change-Id: If03adc907d9558baa0a45a1833b857206b7bf96a
2014-07-17 16:28:52 +01:00
Niels Egberts
b4a139cc12 Merge "TtsSpan builders for each TtsSpan type. DO NOT MERGE" into lmp-dev 2014-07-17 00:15:07 +00:00
Niels Egberts
36e08484ab TtsSpan builders for each TtsSpan type. DO NOT MERGE
The reason for separate classes for each type, instead of a more flat
structure is to enable easy discovery of the available arguments that
can be set. For L we'll have about 12 types with 30 arguments and
almost all of the arguments are type specific. In future releases
we'll introduce more arguments. With editors that have code completion
one can construct a span without having to consult the documentation.

For now it only contains Text and Cardinal types.

Change-Id: I94531e600133d9f4f59a4170cceef1ee7a360ca7
(cherry picked from commit 90b095aabd8a5c43723821dda37354fd2beb38fb)
2014-07-17 17:17:07 +00:00
Przemyslaw Szczepaniak
672695e423 Add AudioAttributes support in the TTS.
Bug: 16259299
Change-Id: I53f4f7a2b9a3b9a422affaf6abe4aca258e67d7f
2014-07-17 13:19:39 +01:00
Niels Egberts
6c472fe969 TtsSpan builders for each TtsSpan type.
The reason for separate classes for each type, instead of a more flat
structure is to enable easy discovery of the available arguments that
can be set. For L we'll have about 12 types with 30 arguments and
almost all of the arguments are type specific. In future releases
we'll introduce more arguments. With editors that have code completion
one can construct a span without having to consult the documentation.

For now it only contains Text and Cardinal types.

Change-Id: I94531e600133d9f4f59a4170cceef1ee7a360ca7
2014-07-17 12:19:42 +01:00
Dianne Hackborn
faa0192826 Merge "Fix build." into lmp-dev 2014-07-16 23:37:00 +00:00
Dianne Hackborn
a4635d8c7d Fix build.
Change-Id: I3db1e059534581728a52699681b739482aeb913f
2014-07-16 23:23:26 -07:00
Robert Shih
c20533c1a7 MediaRecorder: added constants for WEBM output
Change-Id: Iacbb55bda71bb6da98244255bf2a4c34c7342fb0
2014-07-16 16:06:21 -07:00
Ye Wen
36f36af9d4 Merge "Unhide new MMS API and SMS storage API (1/2)" into lmp-dev 2014-07-16 22:30:55 +00:00
Ye Wen
1b5e3f8a6d Unhide new MMS API and SMS storage API (1/2)
b/14095333

Change-Id: Id7aca41ccc7eae13ddfa8c6835fe8b299b1e83a5
2014-07-16 16:06:23 -07:00
Sailesh Nepal
001bbbb239 TTY: frameworks/base changes
This CL makes the following changes:
  1. New public APIs:
    - TelecommManager.getCurrentTtyMode: This is used to
      get current TTY mode. It's used by Telephony to set
      the phone state before calls are created (which is why
      it can't be a Conneciton API).
    - TelecommConstants.TTY_MODE_*: These are constants
      copied from Phone.java
    - TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED: This
      action is fired when the current TTY mode changes.
      Apps can listen to this before and during a call.
      The old version of this was in TtyIntent.java which
      I deleted.

  2. New private API
    - TelecommManager.isTtySupported: This is used by
      Telephony to hide the TTY settings on devices
      that don't support TTY

  3. Various updates to use the constants renamed in this CL

Change-Id: I652b095af30cc2732a06829dc23492e5355660da
2014-07-16 21:14:58 +00:00
RoboErik
ac17c2a8c9 Merge "Change adjustVolumeBy to adjustVolume" into lmp-dev 2014-07-16 16:25:13 +00:00
RoboErik
1ff5b1648a Change adjustVolumeBy to adjustVolume
This makes volume adjustments take a direction instead of a number of
steps and renames the API appropriately.

Change-Id: I6a31cbc42d889a38aa63446686a424cb2b8b2270
2014-07-16 12:03:45 -07:00
RoboErik
8b4bffcac9 Make MediaSession and MediaController constructors public
This makes the MediaSession/Controller constructors public and registers
with the system behind the scenes.

This also adds a bit about needing to call setActive(true) to start receiving
commands in MediaSession's docs.

Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
2014-07-16 12:03:45 -07:00
Jean-Michel Trivi
8663345733 am 1a0cbfe3: am a880e639: Merge "MediaPlayer factory method with audio attributes and session ID" into lmp-dev
* commit '1a0cbfe3dcc602e0fb2bc624dbd9c0eb545aa604':
  MediaPlayer factory method with audio attributes and session ID
2014-07-16 19:03:44 +00:00
Jae Seo
fba5bbf504 am e17da5d2: am ab39b29c: Merge "Implement TvContentRating" into lmp-dev
* commit 'e17da5d2729196f326f972236a57449af0e79f6b':
  Implement TvContentRating
2014-07-16 18:16:04 +00:00
Andrew Lee
4bad1bec24 am b1b54dcb: am 30004856: Merge "Adding getVideoState method to Telecomm Call\'s details." into lmp-dev
* commit 'b1b54dcb7e0f694aab3b871943759ca48bd368e5':
  Adding getVideoState method to Telecomm Call's details.
2014-07-16 18:11:37 +00:00
Derek Tan
4baadcae27 am b4a81d8a: am d47c2729: Merge "Remove @hide annotations from important carrier privileged APIs." into lmp-dev
* commit 'b4a81d8a6b9dfc88a66873425918e27710cfd6f0':
  Remove @hide annotations from important carrier privileged APIs.
2014-07-16 17:19:33 +00:00
Jeff Sharkey
faee1741db am 97308915: am 5ddccbd2: Merge "Add code cache directory for apps." into lmp-dev
* commit '9730891509b0c7bb50b0b2ecf498c3b993dcef39':
  Add code cache directory for apps.
2014-07-16 17:04:05 +00:00
Derek Tan
0ab985092b Merge "Remove @hide annotations from important carrier privileged APIs." into lmp-dev 2014-07-16 16:25:13 +00:00
Derek Tan
06b41ea23f Remove @hide annotations from important carrier privileged APIs.
Most of these APIs are protected by MODIFY_PHONE_STATE or carrier
privilege. Some APIs are protected by READ_PHONE_STATE.

Change-Id: Ifa04b5fb6d4bb5f21af7f728bee7dcbf77c8583b
2014-07-16 09:32:57 -07:00
Jeff Sharkey
d0a2de06a7 Merge "Add code cache directory for apps." into lmp-dev 2014-07-16 16:25:13 +00:00
Jean-Michel Trivi
e9fdeaaa74 am e3033232: am a8b0cf1d: Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
* commit 'e3033232311395bf23ee25b8308992ce5aa2df28':
  Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
2014-07-16 14:52:55 +00:00
Jean-Michel Trivi
79f5cd1429 Unhide MediaPlayer.setAudioAttributes(), javadoc clarifications
Unhide MediaPlayer.setAudioAttributes() method.

Update javadoc to explicitly state that the factory methods
  do not let you set the audio stream type, attributes or session.

Change-Id: I0d097c314db010698b035349befe0659ab4d1dde
2014-07-16 14:41:06 +00:00