17528 Commits

Author SHA1 Message Date
Jeff Sharkey
43e1565370 am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev
* commit '9a78d4deb2d00dc67b2c11daf76b389e0712b535':
  Per-app media directories on external storage.
2014-05-30 23:51:46 +00:00
Jeff Sharkey
05dc18d69a Merge "Per-app media directories on external storage." into lmp-preview-dev 2014-05-30 23:47:00 +00:00
Jeff Sharkey
2ee3c1e189 Per-app media directories on external storage.
This change defines per-app directories on external storage that
will be scanned and included in MediaStore.  This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
2014-05-30 16:26:45 -07:00
RoboErik
4e4160cd5e am 80ec18a9: Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev
* commit '80ec18a90a1ce3d1b68deba8bcf81abcca04e520':
  Refactor transport controls APIs
  API changes to sessions
2014-05-30 22:21:07 +00:00
RoboErik
283c907a6a Merge changes I16ad392e,Ie26a7d01 into lmp-preview-dev
* changes:
  Refactor transport controls APIs
  API changes to sessions
2014-05-30 22:18:54 +00:00
Chris Wren
9e427694a5 am 3d2f4c6b: Add people signals to Zen mode.
* commit '3d2f4c6b1f3496de3b9c8ece1556684a6cb27903':
  Add people signals to Zen mode.
2014-05-30 21:39:24 +00:00
Chris Wren
9fd259dd26 am bef7d256: Merge "Track Zen Mode status in the NotificationRecord" into lmp-preview-dev
* commit 'bef7d25652c767f9850ec7ad6c51812b1c8db69d':
  Track Zen Mode status in the NotificationRecord
2014-05-30 21:39:19 +00:00
Chris Wren
99f963ea04 Add people signals to Zen mode.
Depends-On: I51fcf689ddbee7715e3387b865f18a715887c943
Change-Id: I7c91dec1afeb54505426c4da59ec4d072a60c240
2014-05-30 16:16:23 -04:00
Chris Wren
4f0e39a929 Merge "Track Zen Mode status in the NotificationRecord" into lmp-preview-dev 2014-05-30 20:15:38 +00:00
Chris Wren
333a61c3a5 Track Zen Mode status in the NotificationRecord
This requires the record to be present in makeRankingUpdateForListener,
however, if the ranking object is created before the post to the handler,
then no cloning is necessary.

Depends-On: I907a1ff28123219db1c08889d723ad1b70b191ab
Change-Id: I51fcf689ddbee7715e3387b865f18a715887c943
2014-05-30 16:09:51 -04:00
Sreeram Ramachandran
515350a5e2 Support legacy routes added by apps via ensureRouteToHost().
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
(cherry picked from commit fb17b32550de624b7f476b70b7a2fc77f31dde7d)
2014-05-30 18:21:34 +00:00
Dianne Hackborn
8b466c19d6 am f6550f0a: Merge "More work on voice interaction visuals." into lmp-preview-dev
* commit 'f6550f0ab2fb1abae6f9d694c87ccba9bede57f4':
  More work on voice interaction visuals.
2014-05-30 17:17:55 +00:00
Eric Laurent
7b587884ba Merge "indicate in and out audio device connection separately" 2014-05-30 17:08:43 +00:00
Dianne Hackborn
20d9474904 More work on voice interaction visuals.
There is now a special theme for voice interaction activities
to use, so they can be a panel that is better intergrated with
the rest of the voice interaction experience.  This is still
not completely working, I have some hacks in the demo app to
get it right; I'll fix that in a future change.

Also improve VoiceInteractor to be retained across activity
instances, for things like rotation.

And bump up the number of concurrent broadcasts that are allowed
on non-svelte devices, since they can handle more and this makes
the boot experience better when dispatching BOOT_COMPLETED.

Change-Id: Ie86b5fd09b928da20d645ec2200577dee3e6889d
2014-05-30 10:06:16 -07:00
Nicolas Prevot
92b25a0ef8 Merge "Cleaning CrossProfileIntentFilters on user deletion." 2014-05-30 12:12:34 +00:00
Narayan Kamath
dfed4bc99f am f7871c31: am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit 'f7871c31469c6245c1b232a15104704f7481103c':
  Support an ABI flag for instrumentation.
2014-05-30 11:51:03 +00:00
Narayan Kamath
f7871c3146 am b9b31f4b: am bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit 'b9b31f4b8eda123e7b544d1a0fa886576064adca':
  Support an ABI flag for instrumentation.
2014-05-30 10:49:00 +00:00
Narayan Kamath
b9b31f4b8e am bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit 'bd4d320344833ce67dad3a4e10a61d0502a81d0e':
  Support an ABI flag for instrumentation.
2014-05-30 10:41:24 +00:00
Narayan Kamath
bd4d320344 Merge "Support an ABI flag for instrumentation." 2014-05-30 10:35:29 +00:00
Yohei Yukawa
8627cef538 Merge "Rebuild the enabled IMEs list when changed in Settings page" 2014-05-30 09:43:32 +00:00
Yohei Yukawa
3d46bab029 Rebuild the enabled IMEs list when changed in Settings page
With this CL, the input method switching controller is notified
even when the list of enabled IMEs is changed by System
Settings.

Ideally we should hook every setter method in
InputMethodSettings to ensure that InputMethodSettings and
InputMethodSubtypeSwitchingController can share the same list.
Until then, most of user visible weirdness should disappear
with this CL.

BUG: 15299968
Change-Id: Ie41da226d71b58d2e12057f85e4793b35e8b9f23
2014-05-30 18:21:11 +09:00
Jungshik Jang
c162902f9a Merge "Start Device Discovery after logical address allocation." 2014-05-30 03:58:30 +00:00
Sreeram Ramachandran
ccf2e6b1e6 Merge "Support legacy routes added by apps via ensureRouteToHost()." 2014-05-30 03:29:39 +00:00
Jungshik Jang
8b308d93c8 Start Device Discovery after logical address allocation.
Usually TV initiates Device Discovery sequence after logical address
allocation of local devices. For that added new callback interface
to AddressAllocationCallback to HdmiCecDevice.
Along with this, add onAddressAllocated to HdmiLocalDevice so that
start sending local device information once logical allocation is done.

Change-Id: I4cdc5dd7770674a17a0f23c383a6c1ca221e3104
2014-05-30 11:41:53 +09:00
Sreeram Ramachandran
1fbcb27198 Support legacy routes added by apps via ensureRouteToHost().
Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9
2014-05-29 19:00:37 -07:00
Jose Lima
a4ab093ddc am 9dbe6159: Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev
* commit '9dbe6159a0eef0f14825ceee101681df7272d9af':
  Only allow 1 Stack on Leanback-only devices
2014-05-30 01:45:41 +00:00
Jose Lima
4f8a92bd20 Merge "Only allow 1 Stack on Leanback-only devices" into lmp-preview-dev 2014-05-30 01:41:18 +00:00
Jeff Brown
094b2136f0 resolved conflicts for merge of 92ab0b91 to master
Change-Id: I66d6849700759163669faa930f07a7e968df5155
2014-05-29 18:25:11 -07:00
Jeff Brown
92ab0b91cd am aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev
* commit 'aeb4e071abb100d10c39d154b05c2911d399395d':
  Add dumpsys to dock observer.
2014-05-30 01:01:17 +00:00
Jeff Brown
010e561a70 Add dumpsys to dock observer.
Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.

eg. View current state.
adb shell dumpsys DockObserver

eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1

eg. Reset back to normal.
adb shell dumpsys DockObserver reset

Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
2014-05-29 17:48:33 -07:00
Eric Laurent
ae4506e9b5 indicate in and out audio device connection separately
Modified AudioService and WiredAccessoryManager to use separate
device connection indications for input and oputput devices in case
of combined devices like wired headset or BT SCO headset.

Change-Id: Ifebaaab177191e2f505824420a13998d7a424aec
2014-05-29 17:36:35 -07:00
Jinsuk Kim
b8861f8b6b Merge "Stop publishing HdmiCecService, start publishing HdmiControlService" 2014-05-29 21:36:47 +00:00
Christopher Tate
3d5e5c7b26 Merge "DO NOT MERGE Implementation of TaskManager reschedule/cancel" into lmp-preview-dev 2014-05-29 21:17:32 +00:00
Winson Chung
c5b5275b8d am 48e3f61c: Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev
* commit '48e3f61cfcd804575780d2958bd4e53420bd8266':
  Updating task view style, fixing performance on enter-recents animation.
2014-05-29 21:15:20 +00:00
Winson Chung
073c2e4ad1 Merge "Updating task view style, fixing performance on enter-recents animation." into lmp-preview-dev 2014-05-29 21:10:15 +00:00
Jinsuk Kim
8692fc68a4 Stop publishing HdmiCecService, start publishing HdmiControlService
HdmiCecService will soon be deprecated and replaced with HdmiControlService.
Stopped publishing the service, and turned the corresponding manager to
stub so that it will do nothing but print out a warning msg instead.

Will help the app transition to the new service in the meantime. Once
the migration is finished, will gut out all the HdmiCecService/
HdmiCecManager stuff.

Change-Id: Ic34a69c4fb99f4e5a2c8323538195204ab16a545
2014-05-29 21:09:43 +00:00
Winson Chung
24cf152483 Updating task view style, fixing performance on enter-recents animation.
Change-Id: I42ca9296170a93a14184ae8963abbd3f0494e503
2014-05-29 12:30:26 -07:00
RoboErik
79fa4630bb API changes to sessions
Changes requested by API Council review. A second CL will refactor
TransportController and TransportPerformer based on feedback.

Change-Id: Ie26a7d01d7021232a66c2edf1eb58120437fdfde
2014-05-29 11:28:48 -07:00
Chris Wren
8756a9897a Merge "add tests for ValidateNotificationPeople.getExtraPeople()" 2014-05-29 17:59:37 +00:00
Nicolas Prevot
1015efb143 Merge "Making the content resolver work with result intents." 2014-05-29 17:02:20 +00:00
Craig Mautner
7a18498559 am b5b37c2b: Merge "Add methods to coordinate unlock animation." into lmp-preview-dev
* commit 'b5b37c2babe744acb002ed9b8556a9d9cd2202fc':
  Add methods to coordinate unlock animation.
2014-05-29 16:52:13 +00:00
Craig Mautner
71ac80c46a Merge "Revert "Modify task navigation to return to recent tasks." DO NOT MERGE" into lmp-preview-dev 2014-05-29 16:51:24 +00:00
Craig Mautner
b9a6c8ad99 Revert "Modify task navigation to return to recent tasks." DO NOT MERGE
This reverts commit 1a4e211e03f1f795d935058e27356a0e8bc5df7c.

Change-Id: Ia691b93347c7eb2395933e5a5ba385ea94e08d6f
2014-05-29 16:50:59 +00:00
Craig Mautner
fdaaf91f35 Merge "Revert "Modify task navigation to return to recent tasks."" 2014-05-29 16:50:11 +00:00
Craig Mautner
719e621186 Revert "Modify task navigation to return to recent tasks."
This reverts commit 19174878e25ebfd8806595f83df7bdea1d239c07.

Change-Id: I98db2c9aa975495c5828b3d16b8b45f515e6a5fa
2014-05-29 16:49:41 +00:00
Craig Mautner
219d7a50fb Merge "Add methods to coordinate unlock animation." into lmp-preview-dev 2014-05-29 16:45:36 +00:00
Chris Wren
92af372fc6 add tests for ValidateNotificationPeople.getExtraPeople()
Change-Id: Ieb8acce58574c25cccce674b4494f75d96b57125
2014-05-29 16:14:31 +00:00
Nicolas Prevot
a422a07d29 Merge "Small fix related to Cross-profile intents." 2014-05-29 12:58:39 +00:00
Lorenzo Colitti
bce0106c41 Don't break things if a network goes back to CONNECTED.
Currently, if a network goes from CONNECTED to some other "live"
state (e.g., CONNECTING, because it's VERIFYING_POOR_LINK) and
back, ConnectivityService treats it as if a new network had
connected.  This causes it to attempt to create the network
(which fails, since a network with that netid already exists), to
trigger verification, and if the verification succeeds, to tear
down the network because the request it's satisfying is already
satisfied by the network itself.

Instead, if creating the network fails, assume it's because the
network had already been created, and bail out.

Also, when validation completes, ignore NetworkRequests that were
being served by the same NetworkAgent as before.

Bug: 15244052

(cherry picked from commit cfff026ec47afc7e31f60f80e3deea7f4e2f9be5)

Change-Id: I52c2220e8f1d98fca765880be3040593e92722ed
2014-05-29 21:36:07 +09:00
Lorenzo Colitti
adbb17906e Merge "Don't break things if a network goes back to CONNECTED." 2014-05-29 12:25:46 +00:00