Commit Graph

3866 Commits

Author SHA1 Message Date
Dianne Hackborn
00fcdc1236 am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev
* commit 'd6f7d9b75931d031086a744cfd18994b2673f311':
  Clean up voice API.
2014-05-31 00:00:05 +00:00
Dianne Hackborn
725010a83f Merge "Clean up voice API." into lmp-preview-dev 2014-05-30 23:54:11 +00:00
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
Dianne Hackborn
a2c076d540 Clean up voice API.
Add various java docs.

Switch to CharSequence where appropriate.

Add new request for canceling voice interaction.

Also update test app to follow API changes and be more better.

Change-Id: If27eeba53cf6444660adb7d37ea2ce0557c6c91f
2014-05-30 16:42:57 -07: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
Adam Powell
1994f41803 am d4a453ce: Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev
* commit 'd4a453ce132c926c136015e6799b0528656c9409':
  Compatibility fix for apps that construct Notification.Builders early
2014-05-30 21:39:14 +00:00
Dianne Hackborn
25ceaab596 am 3a967f83: Merge "Mark getRecentTasks() and getRunningTasks() as deprecated." into lmp-preview-dev
* commit '3a967f8331a29ec1b5b8a44cda028417e0ef1e2c':
  Mark getRecentTasks() and getRunningTasks() as deprecated.
2014-05-30 21:38:49 +00:00
Adam Powell
da44532b61 Merge "Compatibility fix for apps that construct Notification.Builders early" into lmp-preview-dev 2014-05-30 20:01:54 +00:00
Adam Powell
bf06fa0479 Compatibility fix for apps that construct Notification.Builders early
Some apps in the wild are known to construct a Notification.Builder
from within their Activity constructor, passing said Activity instance
as the Context parameter. However at this point in the Activity's
lifecycle the ContextWrapper's base context has not yet been populated
and most calls to Context methods will fail.

Even though this was technically undefined behavior in the past, as
apps have little to no way to guess at these internal implementation
details it's probably best to preserve old expectations. Add a note
in Notification.Builder for future framework developers and remove the
offending call - the associated field was never used anyway.

ಠ_ಠ

Change-Id: I4cf3df10be14739babc8ae9a969d261a7ecf8beb
2014-05-30 12:32:18 -07:00
Dianne Hackborn
a25a8b289b Mark getRecentTasks() and getRunningTasks() as deprecated.
Change-Id: Idba79d7a4c0b9f0929f8dd27f25bd6aa548f5622
2014-05-30 12:30:35 -07: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
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
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
Jinsuk Kim
3d9bae3500 Merge "Register HdmiControlService" 2014-05-30 01:39:59 +00:00
Christopher Tate
74318c98a0 Provide stable concrete wrapper for backup transport API
This initial version is a simple pass-through of the existing
IBackupTransport AIDL definition.

Change-Id: I0f6c9ffc7101f82127ab61ba6cba9f5003af6a0c
2014-05-29 15:19:21 -07: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
George Mount
fffa58ef3e am 225f5d1c: Merge "Moved shared element motion to be in called Activity." into lmp-preview-dev
* commit '225f5d1c69395301f9782cc38714e5ca5db5e3d5':
  Moved shared element motion to be in called Activity.
2014-05-29 18:20:22 +00:00
George Mount
c93ca16173 Moved shared element motion to be in called Activity.
Bug 15198605

Change-Id: I07ce4f3366dbdc6957d789f724e49d260fe34faf
2014-05-29 09:36:03 -07:00
Jinsuk Kim
7f01f8e76f Register HdmiControlService
Register the new service that will replace HdmiCecService.
The old one will be removed once the client of the old service
finishes migration to the new service.

Change-Id: I3906292fcf0a7c8286bc89af21a03bd11d3a0e72
2014-05-29 17:10:39 +09:00
Griff Hazen
6b5f93e92b am cc212d35: am 339f437d: Additional doc fixes for WearableExtender
* commit 'cc212d35aa611324e98aa2092c1ab588a0efe794':
  Additional doc fixes for WearableExtender
2014-05-29 07:24:18 +00:00
Griff Hazen
cc212d35aa am 339f437d: Additional doc fixes for WearableExtender
* commit '339f437dc3f7c474d9cf1f963819bab2596e6ad3':
  Additional doc fixes for WearableExtender
2014-05-29 06:34:01 +00:00
Griff Hazen
ca48d35423 DO NOT MERGE Cherry-pick: Additional doc fixes for WearableExtender
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
2014-05-28 22:37:13 -07:00
Matthew Williams
9b9244b694 DO NOT MERGE Implementation of TaskManager reschedule/cancel
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions
2014-05-29 00:45:02 +00:00
Adam Powell
88e719fd3e am 49a4961e: Merge "Toolbar factoring and ActionBar functionality integration" into lmp-preview-dev
* commit '49a4961efde042f4921393f59cff86c2b7889c71':
  Toolbar factoring and ActionBar functionality integration
2014-05-28 23:07:25 +00:00
Adam Powell
e021e6ed89 Toolbar factoring and ActionBar functionality integration
Toolbars now can act in the role of ActionBar with the exception of
navigation modes. Expandable action views are now supported as well as
populating menu items from a host window.

Change-Id: If477db9c7ad9f95723f28cf73cbf03a07ce9d6ad
2014-05-28 12:36:38 -07:00
Christopher Tate
560ce61c59 Merge "DO NOT MERGE - Run the task manager service at startup" into lmp-preview-dev 2014-05-28 19:03:03 +00:00
Griff Hazen
8c2a828849 am c15d315a: am a9cb1e66: Add full screen size preset to WearableExtender
* commit 'c15d315aeb2c23895e940560784bd51f7962b702':
  Add full screen size preset to WearableExtender
2014-05-28 17:44:11 +00:00
Griff Hazen
339f437dc3 Additional doc fixes for WearableExtender
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
2014-05-28 09:13:05 -07:00
Griff Hazen
10f6de686e Merge "DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender" into lmp-preview-dev 2014-05-28 15:59:14 +00:00
George Mount
854ed1c4e2 am 27d805ea: Merge "Use activity transitions when launched from fragments." into lmp-preview-dev
* commit '27d805ea6fb5aa3dbe46d4f8af86c46bce523760':
  Use activity transitions when launched from fragments.
2014-05-28 14:42:01 +00:00
George Mount
1cc3e2e7a0 Merge "Use activity transitions when launched from fragments." into lmp-preview-dev 2014-05-28 14:37:34 +00:00
George Mount
f0ebc5dc21 Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev 2014-05-28 14:37:19 +00:00
Matthew Williams
bc132a068b Merge "Implementation of TaskManager reschedule/cancel" 2014-05-28 02:52:00 +00:00
Matthew Williams
b61c506a50 Implementation of TaskManager reschedule/cancel
Issues here:
"Reschedule" of an idle-mode task is not well-defined. In the
API I throw an error if you try to set a back-off policy on
an idle mode task.
Implementation-wise, i add a delay for a reschedule request of an
idle mode task. This means that if the phone's still in idle mode
after the delay they app will get a call back, but otherwise it'll
have to wait til the next one.

Implemented all API functions

Change-Id: I0264c2614cc52c28730abbcb1557f314f058f991
2014-05-27 18:36:54 -07:00
Griff Hazen
d5f11f98d1 DO NOT MERGE Cherry-pick: Add full screen size preset to WearableExtender
Bug: 14838838

Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
2014-05-27 17:36:44 -07:00
Griff Hazen
14f5799ba9 DO NOT MERGE Cherry-pick: Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 17:34:27 -07:00
Griff Hazen
e6fff6e088 Merge "DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications" into lmp-preview-dev 2014-05-28 00:31:46 +00:00
Griff Hazen
c15d315aeb am a9cb1e66: Add full screen size preset to WearableExtender
* commit 'a9cb1e66737f816d643bca03832af719cbdd0f20':
  Add full screen size preset to WearableExtender
2014-05-28 00:18:03 +00:00
Griff Hazen
69170a56c6 am be5898b1: am 6f72ac5d: Doc fixes for Notification.WearableExtender
* commit 'be5898b198a9eee2d21eeff345ed19573d37257a':
  Doc fixes for Notification.WearableExtender
2014-05-27 22:47:27 +00:00
Griff Hazen
be5898b198 am 6f72ac5d: Doc fixes for Notification.WearableExtender
* commit '6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
  Doc fixes for Notification.WearableExtender
2014-05-27 22:44:28 +00:00
Griff Hazen
a9cb1e6673 Add full screen size preset to WearableExtender
For custom display notifications.

Bug: 14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
2014-05-27 15:40:09 -07:00
Griff Hazen
6f72ac5d5f Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
2014-05-27 11:28:45 -07:00
Winson Chung
2eb4f9c377 DO NOT MERGE
Removing unnecessary public values. (Bug 14995844)
(cherry picked from commit aa327fc2ce428f939885e1172578ff1dc975214c)

Change-Id: I98672d0ed3120c15bf31ce7a21ab604cfe66273d
2014-05-27 17:07:52 +00:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Griff Hazen
61a9e8635f DO NOT MERGE Cherry-pick: Api updates for wearable extensions to notifications
Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
2014-05-25 19:37:32 -07:00
Christopher Tate
fa380e982e DO NOT MERGE - Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content.

(Cherrypick from master)

Change-Id: Ic07a664bf54bc3e40aa0b892946edba4bf37262a
2014-05-23 16:41:09 -07:00
Christopher Tate
8f64f80888 Run the task manager service at startup
Also moves most of it into android.app.task rather than android.content.

Bug 14993295
Bug 14997851

Change-Id: I9b5738d026ea2526cdfbc96d0239c74687c51611
2014-05-23 16:07:45 -07:00