Commit Graph

3889 Commits

Author SHA1 Message Date
Sander Alewijnse
1b8737ee18 Merge "Remove enableSystemApp() and enableSystemAppWithInten()." 2014-06-04 10:11:46 +00:00
George Mount
d7954a8a29 am 5a745332: Merge "Delay sending shared element position until after layout." into lmp-preview-dev
* commit '5a745332b3e5bac89052484e2ae4978a9a1e1bcd':
  Delay sending shared element position until after layout.
2014-06-03 17:15:47 +00:00
Nicolas Prevot
93d8c7259d Merge "Adding user consent extras to DevicePolicyManager." 2014-06-03 17:08:50 +00:00
Nicolas Prevot
3742ec394f Adding user consent extras to DevicePolicyManager.
Adding ACTION_PROVISIONING_USER_HAS_CONSENTED and EXTRA_PROVISIONING_TOKEN to DevicePolicyManager.
They can be used to tell ManagedProvisioning to skip user consent.

Change-Id: I5ef8ab2a14969bb29a2ee3dbdce5ca3225e0759a
2014-06-03 17:07:34 +00:00
Jae Seo
4c9e57f156 resolved conflicts for merge of ebe661c4 to master
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
2014-06-03 17:06:58 +00:00
Christopher Tate
c777185688 Finish migration of backup transport constants
...and make sure to fix a couple of lingering Javadoc references.

Bug 15329632

Change-Id: I1de7b53a58940834cd2dae2301fd5f65dbb48ba6
2014-06-02 19:10:54 -07:00
Christopher Tate
bfb131317b Merge "Add full-backup stream API to BackupTransport" 2014-06-03 02:07:01 +00:00
Christopher Tate
4dd2635bf5 Add full-backup stream API to BackupTransport
Also started migrating the definition of transport success/failure constants
into BackupTransport to make them permanent.

The new methods are not yet plumbed in; this is just to allow forward
progress against a proposed stable API.

Bug 15329632

Change-Id: I27472e09b831350c140b9fa548ebda3af334eb1a
2014-06-02 18:57:21 -07:00
George Mount
cdd5c8f34b Merge "Delay sending shared element position until after layout." into lmp-preview-dev 2014-06-02 22:42:45 +00:00
Fabrice Di Meglio
b3d5856e68 am f3c294df: Merge "Code cleaning" into lmp-preview-dev
* commit 'f3c294df46bab8f50bead51e70f562778b8c5deb':
  Code cleaning
2014-06-02 22:10:36 +00:00
Jae Seo
3c784d6359 Merge "Put TV Input Framework under android.media.tv, including TvContract" into lmp-preview-dev 2014-06-02 21:03:58 +00:00
Fabrice Di Meglio
b75a69f9b3 Merge "Code cleaning" into lmp-preview-dev 2014-06-02 20:50:43 +00:00
George Mount
d265bd7446 Delay sending shared element position until after layout.
Bug 15380396

Also updated fade duration to 300ms now that shared element
transition can take place before fade.

Change-Id: I9053615c83b9e0938b015645de0eb6c1534cbb34
2014-06-02 13:39:14 -07:00
Jae Seo
d5cc4a281e Put TV Input Framework under android.media.tv, including TvContract
Bug: 15345342
Change-Id: I665ca23f0f074ce29cb2e047109b209178532107
2014-06-02 11:02:52 -07:00
Jungshik Jang
11969e8266 Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev 2014-06-02 04:37:46 +00:00
Jinsuk Kim
af9d45e88b DO NOT MERGE: 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-06-02 11:03:45 +09:00
Adam Powell
535499204b am 16b0baa4: Merge "Further implementation for ToolbarActionBar" into lmp-preview-dev
* commit '16b0baa45bd68bb05863d3a6e92b7e8e0b452cb2':
  Further implementation for ToolbarActionBar
2014-06-02 00:25:41 +00:00
Adam Powell
07a74548ae Further implementation for ToolbarActionBar
Integrate activity options menu and inline Toolbars. Fix a series of
small associated bugs.

Activities now (privately) offer several menu-related events directly
to the associated ActionBar. In the future this should help us
untangle some of the menu-based pasta in PhoneWindow.

Bug 15344598

Change-Id: I76211ad17d2bcbb58cf1d88914e855416d084ded
2014-06-01 17:15:42 -07:00
Adam Powell
1462ddcbd6 am 56ac0185: Change parameter name for Activity#setActionBar
* commit '56ac018506f527ecd6b7a76adf824066371aa4fa':
  Change parameter name for Activity#setActionBar
2014-06-01 20:36:05 +00:00
Adam Powell
377801463e Change parameter name for Activity#setActionBar
Feedback from API review

Bug 14998253

Change-Id: Id3b87a8071d43de49847e93fd6229d48364bf55e
2014-06-01 13:31:00 -07:00
Amith Yamasani
f20d640fa2 Restrictions Manager
Mechanism to register a provider for requesting an
administrator to respond to permission requests.

Request format and response format constants.

Description of manifest template for static restrictions.
Int type introduced in RestrictionEntry.

Needs more javadoc and better description of manifest templates,
including specifying the XML attributes.

Change-Id: I5a654d364e98379fc60f73db2e06bf9a8310263d
2014-05-31 16:41:35 -07:00
Fabrice Di Meglio
ca37602794 Code cleaning
- fix some typos

Change-Id: Ia5a5c26e85569435715c4efb3d8740f508545b90
2014-05-30 18:20:50 -07:00
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