Commit Graph

2566 Commits

Author SHA1 Message Date
Christopher Tate
0188bee2c5 am d8f71d34: Merge "Out with the old; in with the new" into lmp-preview-dev
* commit 'd8f71d34c3c7fb161a1586de8edb52161c32d672':
  Out with the old; in with the new
2014-06-11 17:02:18 +00:00
Christopher Tate
7060b04f6d Out with the old; in with the new
Switch to the official "JobScheduler" etc naming.

Bug 14997851

Change-Id: I73a61aaa9af0740c114d08188bd97c52f3ac86b7
2014-06-10 12:51:55 -07:00
Matthew Williams
7b5c2340ad am e389d1ea: Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev
* commit 'e389d1ea63b0a9caa6d069254ac661ca6420917f':
  Remove SyncRequest.setPriority from public API
2014-06-10 18:05:41 +00:00
Craig Mautner
7683baad6c am a7c5791a: Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev
* commit 'a7c5791a95bf732c2381f698d78930ee61efd36b':
  Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
2014-06-10 17:21:52 +00:00
Matthew Williams
c2c1a39510 Merge "Remove SyncRequest.setPriority from public API" into lmp-preview-dev 2014-06-10 15:50:11 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
2014-06-10 07:53:03 -07:00
Jeff Sharkey
d734c698e3 am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
  Refactor directory API to "opening document tree."
2014-06-10 11:18:54 +00:00
Adam Connors
ac383e52a9 DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
2014-06-10 10:24:14 +00:00
Kenny Guy
ef2b37ea87 Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only." 2014-06-10 08:55:47 +00:00
Matthew Williams
2368014073 Remove SyncRequest.setPriority from public API
Bug: 15517262
Change-Id: If62b6f3bf339011dd504889aa24c71a22cb08ed8
2014-06-09 20:18:25 -07:00
Craig Mautner
df8e542a8a Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 2014-06-10 01:29:43 +00:00
Craig Mautner
f357c0ca51 Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK
Change definition of FLAG_ACTIVITY_NEW_DOCUMENT from
FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to
FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET alone.

Also add new documentLaunchMode of "never" to allow activity
writers to keep their activity from being launched in document mode.

Fixes bug 15468528.

Change-Id: Ied11adf97e85c5d3f99f4c0bbbb4a2905dcfb24e
2014-06-09 18:09:33 -07:00
Jinsuk Kim
e44e754166 Merge "Tag HdmiControlService API classes with @hide/@SystemApi" into lmp-preview-dev 2014-06-10 00:11:20 +00:00
Jeff Sharkey
f8f69b899f Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 2014-06-10 00:10:28 +00:00
Jeff Sharkey
b9fbb7290b Refactor directory API to "opening document tree."
Cleans up API so it consistently refers to opening or working with a
subtree of documents.  Also separates isChildDocument() support from
the concept of directory tree selection.

Bug: 15429194
Change-Id: Ice66a751ff4bd0cc4d34c44c5da13a0dc4186dc9
2014-06-09 17:07:58 -07:00
Jinsuk Kim
66d1eb285b Tag HdmiControlService API classes with @hide/@SystemApi
Bug: 15516329, Bug: 15516710
Change-Id: Ie814513a642660b6c5fdc9e891ad1eec1b2d689b
2014-06-09 23:49:21 +00:00
Jeff Brown
5c507c1371 Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
2014-06-09 14:28:11 -07:00
Daniel Sandler
d343aff26d am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
  Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
2014-06-09 19:28:56 +00:00
Ed Heyl
5adb67d4ce merge 4ce22057, regen api/current.txt
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
2014-06-09 10:41:21 -07:00
Daniel Sandler
01df1c680a Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
It sprouts an additional INTENT_ prefix to distinguish it
from the Notification.category constants in the same file.

Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
2014-06-09 16:53:51 +00:00
Adam Connors
d4b584ea7f Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only.
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
2014-06-09 13:55:47 +01:00
Adam Connors
89b3b4a0b2 API Review: rename FEATURE_MANAGEDPROFILES
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
(cherry picked from commit 687efd6f5c05dc1e4a9c284bf3edae901af45942)
2014-06-09 10:58:22 +01:00
Jinsuk Kim
f43cea0094 Merge "Remove HdmiCecService" into lmp-preview-dev 2014-06-09 01:13:29 +00:00
Jinsuk Kim
3f48068d78 Remove HdmiCecService
The service is replaced with HdmiControlService. Removing all the related
classes and the initialization of the service.

Change-Id: Ic7baaddffb9873613ddd1096e874f226da983939
2014-06-09 07:55:47 +09:00
Nick Kralevich
82b3201a95 resolved conflicts for merge of 13ed83ee to master
Change-Id: Ia3739cfa7af60e6a47bf94d403df190f3f2cd082
2014-06-06 21:13:28 -07:00
Craig Mautner
3c9f70dc86 Merge "Implement maxRecents and fix TaskPersister bug" into lmp-preview-dev 2014-06-06 23:14:32 +00:00
Jeff Brown
d5a5b5a547 Rename PrivateApi annotation to SystemApi.
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
2014-06-06 15:16:27 -07:00
Jim Miller
2c1de5b052 Hide the fingerprint API for now. DO NOT MERGE
Change-Id: I78aadf8d03be74eb862c5fe120fa544a2483553c
2014-06-05 19:37:42 -07:00
Craig Mautner
ffcfcaadfe Implement maxRecents and fix TaskPersister bug
Activities can now set the maximum number of times that they will
appear in the recent task lists when using DocCentric mode. The
default number is 15, the min 1, and the max 100.

Also a bug in TaskPersister that deleted files because it did not
properly parse their task ids is fixed.

Fixes bug 13736052.

Change-Id: I7ccb4e6f89d6202ff31c8577bb7b9d8d1b7e5e8d
2014-06-05 10:18:48 -07:00
Adam Connors
7283f963d3 Merge "API Review: rename FEATURE_MANAGEDPROFILES" 2014-06-05 13:07:12 +00:00
Adam Connors
551c0789bc API Review: rename FEATURE_MANAGEDPROFILES
To be FEATURE_MANAGED_PROFILES

Bug: 15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
2014-06-05 12:13:03 +01:00
Matthew Williams
64939ae385 DO NOT MERGE Redact SyncService stuff from master
Cherry-pick over from master.
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851

Change-Id: Ieebbbcd3324827098e88b36e45e6e82315a51e65
2014-06-04 22:46:25 +00:00
Matthew Williams
4b8bb98d63 Merge "Redact SyncService stuff from master" 2014-06-04 22:45:24 +00:00
Elliott Hughes
a2d1454133 am ef3aeeca: am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit 'ef3aeecacd4c47f6baeb96d06d69aad1ca4bcb1a':
  Minor javadoc improvements for PackageManager.
2014-06-04 22:06:28 +00:00
Elliott Hughes
ef3aeecacd am 38a5a257: am 759a8978: Merge "Minor javadoc improvements for PackageManager."
* commit '38a5a257a9aaf85606eb7117d943a877dc7d3c93':
  Minor javadoc improvements for PackageManager.
2014-06-04 22:02:34 +00:00
Matthew Williams
5a9decd589 Redact SyncService stuff from master
This changes the API surface area, deleting things we aren't releasing.
I'll do the internal clean-up at the same time I do the SyncManager
refactor to sit on top of the TaskManager.
Bug: 14997851
Change-Id: Ibefbb246f0e98d3159399151744279902468a23c
2014-06-04 14:55:53 -07:00
Alan Viverette
1fa8b11d93 am cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev
* commit 'cd5b044eaf38cc1fad926dff5d5d1b35c3c8b6a3':
  Fix drawable cache, add quantum assets to preload list
2014-06-04 18:09:14 +00:00
Amaury Medeiros
dde24269c1 Minor javadoc improvements for PackageManager.
- Removed duplicated use of the word "the".
- Changed @return and @param explanation of getApplicationEnabledSetting,
which should get the enabled state of an application and not just one component.

Change-Id: Ide07ec84ceb5b9b5caa28efa9ba838a40ee7b514
Signed-off-by: Amaury Medeiros <amaurymedeiros@gmail.com>
2014-06-03 20:06:41 -03:00
Alan Viverette
b6f9152b70 Fix drawable cache, add quantum assets to preload list
BUG: 15409352
Change-Id: Idb18fd99dc4229aace9082d6e26c88faf81d15bf
2014-06-03 12:52:25 -07:00
Alan Viverette
02a078d088 am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev
* commit '25931adee5ba954220190f48901bb66c8c9dd462':
  Clean up drawable theming APIs
2014-06-03 17:16:27 +00:00
Jae Seo
4c9e57f156 resolved conflicts for merge of ebe661c4 to master
Change-Id: Ic25dc762ee43654b439de3ec237ead007bee3df4
2014-06-03 17:06:58 +00:00
Narayan Kamath
797b109c60 am 7ed98c43: Merge "Add an --abi argument to "pm install""
* commit '7ed98c43f8cbcfbb4862205a72455ab39359a011':
  Add an --abi argument to "pm install"
2014-06-03 13:24:45 +00:00
Narayan Kamath
dad8f819a7 Merge "Add an --abi argument to "pm install"" 2014-06-03 12:01:53 +00:00
Narayan Kamath
116bdbd823 Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

bug: 14453227

(cherry picked from commit 6431d11cd4)

Change-Id: I85d4f8785deea02a6a4d3cb0b05e6ef8bf64826b
2014-06-03 11:35:49 +01:00
Narayan Kamath
6431d11cd4 Add an --abi argument to "pm install"
This allows callers to force an install to a particular
ABI. This is intended only for testing (and CTS) and is
not meant for usage by the installer package.

Change-Id: Icb1528c0cd35b1aa9323386cb35ff4aaba374fcb
2014-06-03 11:11:47 +01:00
Alan Viverette
5a4af17e27 Merge "Clean up drawable theming APIs" into lmp-preview-dev 2014-06-02 23:41:59 +00:00
Alan Viverette
6dbe51b50e Clean up drawable theming APIs
Removes APIs for themed creation of a drawable from a stream, since
that doesn't involve any inflation. Also cleans up tinting methods
left over from previous clean up.

BUG: 15089957
Change-Id: I2af7aa9a6d351ae61b33ee1216c674fae1bffe11
Signed-off-by: Alan Viverette <alanv@google.com>
2014-06-02 16:39:04 -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
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
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