Commit Graph

2542 Commits

Author SHA1 Message Date
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
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
Yuhao Zheng
8407968db6 Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev 2014-05-30 17:08:07 +00:00
Amith Yamasani
de8f11654f am 651fcf79: Merge "Tweak LauncherApps API based on feedback" into lmp-preview-dev
* commit '651fcf798faf62f95bafaf3f1aaa1f05358254a2':
  Tweak LauncherApps API based on feedback
2014-05-30 15:53:21 +00:00
Amith Yamasani
fc2ae28f78 Merge "Tweak LauncherApps API based on feedback" into lmp-preview-dev 2014-05-30 15:49:21 +00:00
Yuhao Zheng
0cb59f2c03 DO NOT MERGE - Wifi Passpoint API change
- hide package android.net.wifi.passpoint
- extend android.net.wifi APIs for Passpoint credential management
  > hide for preview

Bug: 15191967
Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
2014-05-29 23:53:21 -07:00
Yuhao Zheng
e90a218cf1 Merge "Wifi Passpoint API change" 2014-05-30 06:48:48 +00:00
Amith Yamasani
e781c81d33 Tweak LauncherApps API based on feedback
UserHandle must be after packageName/componentName.
Improved javadoc for density.
Added getApplicationInfo().
Remove synchronized methods.

Temporarily @hide the old APIs to make sure they continue to work
for unbundled launchers.

Bug: 15025908
Change-Id: Iee6336b54e1b4d5c43f1e643062327ff463cb695
2014-05-29 19:00:40 -07:00
Yuhao Zheng
8a9eb81df1 Wifi Passpoint API change
- hide package android.net.wifi.passpoint
- extend android.net.wifi APIs for Passpoint credential management
  > hide for preview

Bug: 15191967
Change-Id: Ic90818cf5c91e93dd7890774543e08b842edc594
2014-05-29 16:18:36 -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
Amith Yamasani
4b9d79c30e Fix singleUser attribute
Make it work correctly for singleton content providers.
Relax which apps can export singleton content providers.

Change-Id: I43d315c25ed76a876bfa6d5e0d1351bc19c9bdba
2014-05-28 09:39:36 -07:00
Nicolas Prevot
e282c97e21 Merge "Rename code related to cross-profile intents." 2014-05-27 10:07:58 +00:00
Craig Mautner
026596b938 Improve DocCentric documentation. DO NOT MERGE
Fixes bug 15025461.

Change-Id: I34cc13105072cf054f125a7963294165258fec0e
2014-05-24 09:53:10 -07:00
Craig Mautner
21d24a21ea Add code for persisting tasks and activities to disk DO NOT MERGE
Recent tasks that have the persistable flag set are
saved to /data/system/recent_tasks/ on shutdown and in the
background. Their thumbnails are saved to
/data/system/recent_images/.

Change-Id: Ifb820a01c412fe1f8c0f6e41aa655fafd89eaa8d
2014-05-23 18:42:33 -07:00
Craig Mautner
dbcd3aa22a Merge "Improve DocCentric documentation." 2014-05-24 00:46:51 +00: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
6000a6c663 Merge "Run the task manager service at startup" 2014-05-23 23:18:13 +00: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
Craig Mautner
deec695253 Merge "Add code for persisting tasks and activities to disk" 2014-05-23 22:37:20 +00:00
Craig Mautner
2d74ce309f Improve DocCentric documentation.
Fixes bug 15025461.

Change-Id: I34cc13105072cf054f125a7963294165258fec0e
2014-05-23 15:34:48 -07:00
Alan Viverette
9c32f25eb6 am 106210a7: Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev
* commit '106210a703563cfb11c23ab80d8f29b990df7ec5':
  Handle hybrid themes correctly in Drawable cache
2014-05-23 22:33:51 +00:00
Alan Viverette
0b723fdbaa Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev 2014-05-23 22:30:42 +00:00
Andrew Solovay
4daf2779f4 am 59f61cc2: am 768a899f: am b5960898: am 9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '59f61cc23d47f7ad714cf99be32fd70a66dba84e':
  doc: Updated branding guidelines per request from @deniseamling.
  Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
2014-05-23 19:33:57 +00:00
Nicolas Prevot
8194899071 Rename code related to cross-profile intents.
For example, replace ForwardingIntentFilter by CrossProfileIntentFilter

Bug: 15023443

Change-Id: Iee8cdf578817ef9956bcdece803a49b0d07b67f7
2014-05-23 13:16:01 +01:00
Craig Mautner
ef73ee1dd9 Add code for persisting tasks and activities to disk
Recent tasks that have the persistable flag set are
saved to /data/system/recent_tasks/ on shutdown and in the
background. Their thumbnails are saved to
/data/system/recent_images/.

Change-Id: Ifb820a01c412fe1f8c0f6e41aa655fafd89eaa8d
2014-05-22 23:41:42 -07:00