8136 Commits

Author SHA1 Message Date
Andrew Lee
5cd2fac7e2 am ba09e36f: am 3441f3c5: am 9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev
* commit 'ba09e36f0c84507823a51ba58fdf59b70ec28d5b':
  Pass through video state when answering a call.
2014-07-17 22:00:22 +00:00
Evan Charlton
d4ca3138fd am d84716e7: am 1f42afc6: am 58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev
* commit 'd84716e717e28ecd4060d854898aabe9cea624c2':
  Plumb through StatusHints change notifications
2014-07-17 22:00:18 +00:00
Eino-Ville Talvala
ef33384939 am 9971ee27: am 7e6dd457: am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev
* commit '9971ee27026b799f7e09fabd53ba07c5b43bfd93':
  Add PackageManager features for differentiating camera2 devices
2014-07-17 21:06:22 +00:00
Amith Yamasani
68265b0740 am 840e1535: am 562b7f0d: am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev
* commit '840e1535b9e607be177241552a08ac2b1cb236d6':
  Split telephony restrictions into outgoing calls and sms
2014-07-17 21:06:05 +00:00
Adam Powell
f8c8fc4c27 am 702f8297: am 35b4be8b: am 21b1b8b9: Add nested pre-fling for nested scrolling
* commit '702f82972600b6b78d5fee1d2511488ad405a1b1':
  Add nested pre-fling for nested scrolling
2014-07-17 21:06:00 +00:00
Christopher Tate
4cbb4469e6 am 0c3679f4: am 5763ad39: am e78826f6: Add BackupAgent.onRestoreFinished() callback
* commit '0c3679f423006976766c8eafbc78d7c3702990d5':
  Add BackupAgent.onRestoreFinished() callback
2014-07-17 21:05:25 +00:00
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
Evan Charlton
5b49adea48 Plumb through StatusHints change notifications
When StatusHints are modified, inform listeners. Also expose two
constants for passing optional strings from the CallService to
the in-call UI.

Bug: 13334257
Bug: 13334252

Change-Id: If7fde7c1ca6940cec8b7232469a22900c36dbb17
2014-07-17 12:53:39 -07:00
Adam Powell
b72be59a6a Add nested pre-fling for nested scrolling
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.

Bug 15538504

Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
2014-07-17 11:37:59 -07: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
Jeff Brown
7139645049 Merge "Allow dreams to wake up gently." into lmp-dev 2014-07-17 17:59:02 +00:00
Jeff Brown
f6d466895b Allow dreams to wake up gently.
This change adds a new DreamService.wakeUp() method to allow a
dream to wake itself up gently and perform a transition before
finally finishing.  The power manager will ask a dream to wake
up gently in most cases but may force it to happen immediately
when necessary.

If the dream takes too long to finish itself then the dream
controller will douse it with water summarily after 5 seconds.

Change-Id: Ib0564c5650cd5a454e1acc5aa91fe46995eecfa7
2014-07-18 21:56:08 -07:00
Brian Attwell
891f5b2638 Merge "Mark social APIs stream APIs as deprecated" into lmp-dev 2014-07-17 17:59:02 +00:00
Brian Attwell
bdb13c8c07 Mark social APIs stream APIs as deprecated
Bug: 14490632
Change-Id: I6b54613514e52f34cfcc37d25493a7ea7d636a86
2014-07-18 10:43:31 -07:00
Christopher Tate
2e40d115ca Add BackupAgent.onRestoreFinished() callback
The agent's onRestoreFinished() method is called after all available
data has been delivered to the app, whether via the key/value restore
API or the full-data file-at-a-time API.  This gives the app a stable
opportunity to do any postprocessing that might be appropriate.

Also fixes a lingering bug in the framework's handling of backup
agent lifetimes.  In cases where an existing agent instances was
being rebound, the framework was forgetting to notify the dependent
that the agent was available.  This was causing timeouts and restore
failure.

Bug 16241004

Change-Id: I3f52b299312d30d38b0cba63a2cfaeb934991ef2
2014-07-17 17:43:24 +00: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
Eino-Ville Talvala
7040e9f7fe Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 2014-07-17 02:40:09 +00:00
Eino-Ville Talvala
611fecec08 Add PackageManager features for differentiating camera2 devices
Also rename DNG capability to RAW.

Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
2014-07-17 10:58:16 -07:00
Amith Yamasani
bb4d6a20bd Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 2014-07-17 02:34:24 +00:00
Amith Yamasani
390989da19 Split telephony restrictions into outgoing calls and sms
DISALLOW_TELEPHONY renamed to DISALLOW_OUTGOING_CALLS and introduced
DISALLOW_SMS.

Outgoing emergency calls should always be permitted.

Change-Id: I0a38ef6e2df9dcf62d16fd93622ad61f4327614f
2014-07-17 12:14:52 -07:00
Andrew Lee
e7a7ec6db5 Merge "Pass through video state when answering a call." into lmp-dev 2014-07-17 02:29:54 +00:00
Andrew Lee
8da4c3c11f Pass through video state when answering a call.
Bug: 16013878
Bug: 16015750
Change-Id: Ia9ba6e5f78fcb64e1089db99f5ce11d0ef858ac9
2014-07-17 12:56:49 -07: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