Commit Graph

1538 Commits

Author SHA1 Message Date
Dianne Hackborn
fb5c3dba4d Fix issue #6440173: MenuItem.setIcon(Drawable) scaling incorrectly...
...when resource is aliased

We were not correctly using the final resolved configuration when
retrieving a drawable through Resources.getDrawable().  (It already
does the correct behavior when going through TypedArray.getDrawable()).

Change-Id: I9032b788b592412178e31e2e6b0181b92c20fe45
2012-05-18 15:51:27 -07:00
Jeff Sharkey
9cb660fa34 Merge "Guard against apps breaking CHOOSER contract." into jb-dev 2012-05-18 14:20:02 -07:00
Jeff Sharkey
1c29700c5f Guard against apps breaking CHOOSER contract.
Bug: 6520937
Change-Id: I677a644cf7765bbb046f9c82e1ebd8a40968cee6
2012-05-18 13:55:47 -07:00
Dianne Hackborn
0cf2c8a533 Fix issue #6515427: Add android.hardware.television and fix...
...logic for notouch in Configuration

Added new TELEVISION feature.

We now force the configuration to "television" if the TELEVISION
feature is set, and "notouch" if the TOUCHSCREEN feature is not set.

Also cleaned up documentation, deprecated some configurations that
are not used.

Change-Id: If1c7a284b580a8a66bda2a75f0c7fa841b3dc9b7
2012-05-17 18:11:14 -07:00
Dianne Hackborn
e302a16235 A few odds and ends.
- Add documentation on "television" UI mode.
- Tweak new documentation and implementation around propagating
  URI grants through choosers.
- Add new activity launch flag for closing system dialogs.

Change-Id: I978c05f0dc3d16e1c55d43631828b9efa6335b19
2012-05-15 14:58:32 -07:00
Jeff Sharkey
3b7d1ef4be Migrate stream extras in CHOOSER intents.
When sending CHOOSER intent, inspect its target for any EXTRA_STREAM
needing migration. If any migration happens, copy the ClipData to
the CHOOSER intent and set GRANT_READ flag. Also update CHOOSER docs.

Bug: 6463773
Change-Id: I66a7adf7bf6f2f173866925cb7e048f4c7a63222
2012-05-14 17:37:11 -07:00
Jeff Sharkey
cd5862586a Merge "Enforce READ_EXTERNAL through Settings.Secure." into jb-dev 2012-05-11 15:47:01 -07:00
Jeff Sharkey
f53857716a Enforce READ_EXTERNAL through Settings.Secure.
Always defers to user-defined setting, when present.

Bug: 6389556
Change-Id: I079d2a41b772facfdac74eefc4c8072fc9284f97
2012-05-11 15:31:39 -07:00
Kenny Root
718af32a19 Merge "Use long instead of int for file offsets" into jb-dev 2012-05-10 14:55:35 -07:00
Jesse Wilson
822b72efd8 Merge "Rename Uri.normalize() to Uri.normalizeScheme()." into jb-dev 2012-05-10 12:39:37 -07:00
Kenny Root
103d53005e Use long instead of int for file offsets
Use long instead of int so we don't run into a 2GB file limit.

Fix possible overflows in offset and length.

Change-Id: Idb3a34f5600f9c2372b9c89256f21757049fa43b
2012-05-10 11:48:21 -07:00
Jesse Wilson
abc43ddd8a Rename Uri.normalize() to Uri.normalizeScheme().
Change-Id: I67839656c7c1c16a5376c9894d699d2bad3c7a5c
2012-05-10 14:31:17 -04:00
Dianne Hackborn
652b6d1e59 Add infrastructure for accessing "unstable" content providers.
We have an API and some stuff that purports to this, but no real
implementation yet.

Change-Id: I93555440014a50fdf79fa3f65318d90fb82265b4
2012-05-09 18:18:40 -07:00
Jeff Brown
8c68012809 Merge "Check for null fd when constructing AssetFileDescriptor." into jb-dev 2012-05-08 18:41:49 -07:00
Carlos Valdivia
3fcf1c8587 Merge "Fix a race condition with respect to clients of SyncStorageEngine." into jb-dev 2012-05-08 15:27:03 -07:00
Jeff Brown
af67fc65bf Check for null fd when constructing AssetFileDescriptor.
An AssetFileDescriptor with a null fd is pretty useless and should
never happen during normal operation.  It can't even be parcelled
without hitting an NPE.  To make it easier to find bugs where a null
fd might have been generated, check at construction time.

Bug: 5655036
Change-Id: I1da6dbee0cab9c11e309f3cebe698bf44dc5e27d
2012-05-08 14:29:09 -07:00
Jeff Brown
947f1c8db0 Merge "Move CancellationSignal to android.os package." into jb-dev 2012-05-08 10:51:12 -07:00
Jeff Brown
a7771df369 Move CancellationSignal to android.os package.
Bug: 6427830
Change-Id: I39451bb1e1d4a8d976ed1c671234f0c8c61658dd
2012-05-07 20:06:46 -07:00
Carlos Valdivia
3aca7d7bec Fix a race condition with respect to clients of SyncStorageEngine.
GetAuthorities will now return a better copy of AuthorityInfos.

Bug: 6388370
Change-Id: Iac532e6e40079dbafa6e1c8345bd74902d68cf85
2012-05-07 19:03:51 -07:00
Anonymous Coward
ceb1b0bfae Add encryption parameters to package installation
Change-Id: Ic9f8ab9f8110f08bb3c00725cfce5b8ee7b766f3
2012-05-07 16:34:49 -07:00
Dianne Hackborn
7bfa14570e Merge "Finish up issue #6249094: Display permissions based on relevance to private data" into jb-dev 2012-05-06 17:49:53 -07:00
Dianne Hackborn
99222d212f Finish up issue #6249094: Display permissions based on relevance to private data
Added bitmaps for permission group icons.  We had to pick either
icons for a dark or light background, and it had to be light for
settings, so the installer theme has gone back to dark.

Tweaked the permission groups to match the icons.

Redid the group priorities to make them correct (they were written
with higher priorities being less important).

Fixed bug where priority was not being used for system apps.

Change-Id: Ia3d3f0c1614a11b4cfd11682ce9e6c9f87d75c06
2012-05-06 17:45:13 -07:00
Fred Quintana
dc47556cb3 fix expedited syncs. there were times when an expedited sync wouldn't
correctly preempt non-expedited syncs

Change-Id: Ia88ce6504c06d7c8e50e40362e8bf2b85bd0934b
2012-05-06 13:39:36 -07:00
Andy Stadler
c4be1b7e96 Merge "Add System Tracing capability to Sync Manager" into jb-dev 2012-05-04 14:46:00 -07:00
Jim Miller
516c25b38a Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 2012-05-04 14:12:41 -07:00
Jim Miller
0799440ab3 Fix 6414061: Add new ACTION_ASSIST intent.
Change-Id: I3d334f67723ac89f6001267e0f06ad76190b929f
2012-05-04 13:52:14 -07:00
Fabrice Di Meglio
66388dcb09 Hide RTL related APIs - DO NOT MERGE
- fix bug #6441155 API review: @hide RTL layout APIs

Change-Id: I13c5ea5f579cecffed9d517f06180ab0576cd26a
2012-05-04 13:15:12 -07:00
Andy Stadler
09b45a3ad9 Add System Tracing capability to Sync Manager
This tracing code is enabled via "systrace.py --set-tags sync"

Change-Id: Ia8bc01adbba345a568405b0ac8ade96e56b40cc1
2012-05-04 11:24:33 -07:00
Dianne Hackborn
0e128bb2e0 New permissions UI.
Had to keep around a little of the old API for the device
admin settings UI to continue to use.

Change-Id: I84c5666a7f3fec0495eae196a0ffc2223c9e6f82
2012-05-03 19:00:23 -07:00
Jeff Sharkey
19eaf0a74d Merge "Catch CCE when migrating to ClipData." into jb-dev 2012-05-01 16:32:38 -07:00
Jeff Sharkey
dd471e6a6f Catch CCE when migrating to ClipData.
Bug: 6231948
Change-Id: I51bc272d29a17881b3d4908fda549da20aa7e6b3
2012-05-01 13:08:27 -07:00
Dianne Hackborn
fd5015be41 Add new APIs for permission group flags and priorities.
Change-Id: I2d476c6aa9dbd05407ec49be45986f42d2acf9e7
2012-04-30 18:19:09 -07:00
Jeff Brown
263d044c79 Merge "Fix CancellationSignal deadlock." into jb-dev 2012-04-27 16:44:23 -07:00
Jeff Brown
aeee2f5d75 Fix CancellationSignal deadlock.
Bug: 6398945
Change-Id: I5a3d4dce74009d6f1d284a8cc54c9f68daa6a9c2
2012-04-26 20:12:44 -07:00
Dianne Hackborn
c5bf758442 Update process importance documentation.
Also be more direct about some of the wallpaper APIs.

Change-Id: I2112898c0cd4415d6c5fd47923de682d59b8291f
2012-04-26 10:58:37 -07:00
Irfan Sheriff
c1da08f1ae Merge "Expose Context.NSD_SERVICE" 2012-04-24 15:13:03 -07:00
Irfan Sheriff
60309fc7bb Expose Context.NSD_SERVICE
Missed exposing Context.NSD_SERVICE for the network service
discovery API

Change-Id: I38cfa93e923286072ded05b707d31cd4db7ff7d4
2012-04-24 14:57:46 -07:00
Jeff Sharkey
ce5a597e66 Merge "Disable READ_EXTERNAL enforcement until API level cut." 2012-04-24 13:10:32 -07:00
Jeff Sharkey
d776f617f5 Disable READ_EXTERNAL enforcement until API level cut.
Bug: 6389556
Change-Id: I78238b9de24c1b8ebb4fdc35d8aafd2e85a4adfe
2012-04-24 13:09:13 -07:00
Glenn Kasten
07b0465095 Scheduling policy service
Change-Id: I6178b96896ffbb3323210f93784a65d724a3e694
2012-04-24 09:53:14 -07:00
Joe Malin
7b5f22e11c am 787fa9dc: am 20176edc: Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1
* commit '787fa9dc69262dc002c9da77fa86e88e5a4e658f':
  DOC CHANGE: Add javadoc to ClipboardManager
2012-04-19 10:13:29 -07:00
Joe Malin
787fa9dc69 am 20176edc: Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1
* commit '20176edc4ff43f10ab3be03d84bb9f02b7859bdb':
  DOC CHANGE: Add javadoc to ClipboardManager
2012-04-19 10:10:18 -07:00
Joe Malin
20176edc4f Merge "DOC CHANGE: Add javadoc to ClipboardManager" into ics-mr1 2012-04-19 10:08:06 -07:00
Amith Yamasani
d95ce04bdc Merge "Make sure persistent processes are not replicated for secondary users." 2012-04-17 11:55:54 -07:00
Amith Yamasani
a4a54e2a5f Make sure persistent processes are not replicated for secondary users.
An intent is launched in a singleton process if the process is persistent
and the resolved activity/service/etc is not requested to run in a different
process.

Change-Id: I1463e73a76bc8bde4185f9cf4395edb47515841d
2012-04-17 11:41:30 -07:00
Dianne Hackborn
ac4243f177 Make ACTION_SEND and ACTION_SEND_MULTIPLE build full clip items.
The current code was just for transferring URI grants.  This change
makes it so it propagates all of the relevant extra data into the
ClipData, so developers can just retrieve the ClipData for all of
their data needs.

Change-Id: I36a050c7beae325aceb84518337f878c337d8b86
2012-04-16 18:10:37 -07:00
Dianne Hackborn
2a07308ed2 Merge "Add direct support for HTML formatted text in ClipData etc." 2012-04-13 16:47:38 -07:00
Dianne Hackborn
acb69bb909 Add direct support for HTML formatted text in ClipData etc.
When using the clipboard, ACTION_SEND, etc., you can now supply
HTML formatted text as one of the representations.  This is exposed
as a set of methods on ClipData for building items with HTML
formatted text, and retrieving and coercing to HTML (and styled)
text.  In addtion, there is a new EXTRA_HTML_TEXT for interoperating
with the old ACTION_SEND protocol.

Change-Id: I8846520a480c8a5f829ec1e693aeebd425ac170d
2012-04-13 15:36:06 -07:00
Jeff Sharkey
10b6f68d48 Merge "Enforce READ_EXTERNAL on non-user builds." 2012-04-13 10:42:33 -07:00
Jeff Sharkey
5d32e772b3 Enforce READ_EXTERNAL on non-user builds.
Enable default enforcement of READ_EXTERNAL_STORAGE on non-user
builds. Users can still explicitly enable enforcement in Settings.

Bug: 6131916
Change-Id: I7dc66b624ad252ed2a2ad3647f3ea85dda7f8e82
2012-04-12 23:29:14 -07:00