7027 Commits

Author SHA1 Message Date
Dianne Hackborn
b3c90a2bfb Fix api.
Change-Id: I5a04152a55b277b8609b033a0c35db30458e1ee2
2014-04-24 11:59:49 -07:00
Dianne Hackborn
806047caca Merge "Start collecting mobile radio activity from the radio." 2014-04-24 18:28:32 +00:00
Adam Powell
58f54dc59d am 46ca5060: Merge "Nested scrolling!"
* commit '46ca506022cb51543dea0489587477f60c570d5f':
  Nested scrolling!
2014-04-24 18:27:37 +00:00
Dianne Hackborn
2ffa11e4b7 Start collecting mobile radio activity from the radio.
Hook in to the new radio API to find out when the radio
is active and use that to track its state in batter stats.
We also still have the data being tracked from the kernel's
emulation, and continue to use that if we don't get data from
the radio.

Currently this monitoring is turned off until some issues
in the radio can be fixed that are providing bad data.

Also add a new API to get estimated drain and charge times.

Change-Id: Ifc4900fabb8f848f9cda361dce698664ea75f175
2014-04-24 11:21:30 -07:00
Adam Powell
46ca506022 Merge "Nested scrolling!" 2014-04-24 18:20:43 +00:00
Adam Powell
10ba27734e Nested scrolling!
or, "Excuse me, Egon, you said crossing the streams was bad."

Add API for driving a nested scroll from the most deeply nested
applicable scrolling view. The deepest scrolling view dispatches
high-level scrolling events up to cooperative parent views.

Augment ScrollView to support nested scrolling. Next up, more public
framework scrolling views.

Change-Id: I53b5e207fcdece796e08c8592ddb4496b96f600e
2014-04-24 10:48:52 -07:00
Craig Mautner
6af40da8af am d2cc56eb: resolved conflicts for merge of f8a58208 to master
* commit 'd2cc56ebb38b0b9e792e81ba9db8148a3a4b72f6':
  Add activity attribute allowEmbedded
2014-04-24 17:34:10 +00:00
Craig Mautner
d2cc56ebb3 resolved conflicts for merge of f8a58208 to master
Conflicts:
	core/java/android/content/pm/PackageParser.java
	core/res/res/values/attrs_manifest.xml
	core/res/res/values/public.xml

Change-Id: I747772e9dbc7ee1cf8993e574de4b3215f6833b2
2014-04-24 10:27:37 -07:00
Craig Mautner
f8a5820817 am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
  Add activity attribute allowEmbedded
2014-04-24 16:33:02 +00:00
Craig Mautner
ffd14a13ce Add activity attribute allowEmbedded
Activitys without allowEmbedded=true may not be launched in an ActivityView.

Fixes bug 13693121.

Change-Id: I431d554300fc3504ab1bc7d73a58d5dad24f8639
2014-04-24 08:41:29 -07:00
Winson Chung
ea1b9eb488 am 1b244f44: Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)"
* commit '1b244f44a796484866f13e0639420477c3191695':
  Piping through ability for an Activity to remove its own task. (Bug 13735914)
2014-04-23 23:53:22 +00:00
Winson Chung
1b244f44a7 Merge "Piping through ability for an Activity to remove its own task. (Bug 13735914)" 2014-04-23 21:35:33 +00:00
Winson Chung
3b3f464445 Piping through ability for an Activity to remove its own task. (Bug 13735914)
Change-Id: Iefcd4fbe68748195de8ee37ee2b6edef55276603
2014-04-23 13:57:06 -07:00
Martijn Coenen
18b3d0b703 am aa1492d1: Dynamic AID registration APIs for HCE.
* commit 'aa1492d1d8c5f80e074faacb83905bd07487975d':
  Dynamic AID registration APIs for HCE.
2014-04-23 20:26:43 +00:00
Martijn Coenen
aa1492d1d8 Dynamic AID registration APIs for HCE.
Adds a set of APIs that allows applications
to dynamically register and unregister AID groups
for HCE and Secure Element based services.

Change-Id: I08e9423dff405955cb725c87423c953a7dbe5c72
2014-04-23 20:21:32 +00:00
Craig Mautner
d76b43a86f am 5723feba: Merge "Introduce PersistableBundle"
* commit '5723febadc1877c045389afffa111913698e32e2':
  Introduce PersistableBundle
2014-04-23 18:53:37 +00:00
Craig Mautner
5723febadc Merge "Introduce PersistableBundle" 2014-04-23 18:48:56 +00:00
Jeff Sharkey
3e5991c1eb am 21de56a9: Add directory selection to DocumentsProvider.
* commit '21de56a94668e0fda1b8bb4ee4f99a09b40d28fd':
  Add directory selection to DocumentsProvider.
2014-04-23 07:15:32 +00:00
Jeff Sharkey
d5f8b4d26a am 846318a3: Allow prefix-based Uri permission grants.
* commit '846318a3250fa95f47a9decfbffb05a31dbd0006':
  Allow prefix-based Uri permission grants.
2014-04-23 07:15:26 +00:00
Jeff Sharkey
21de56a946 Add directory selection to DocumentsProvider.
Introduce new ACTION_PICK_DIRECTORY that allows users to grant access
to an entire document subtree.  Instead of requiring grants for each
individual document, this leverages new prefix URI permission grants
by defining new "via"-style URIs:

content://com.example/via/12/document/24/

This references document 24 by using a prefix grant given for
document 12.  Internally, we use isChildDocument() to enforce that
24 is actually a descendant (child, grandchild, etc) of 12.  Since
this is an optional API, providers indicate support with
Root.FLAG_SUPPORTS_DIR_SELECTION.

Extend DocumentsUI to support picking directories.  Expose
createDocument() API to work with returned directories.

Offer to canonicalize via-style URIs into direct URIs, generating
exact permission grants along the way.  Override openAssetFile()
to pass through CancellationSignal.  Move testing code into ApiDemos.

Bug: 10607375
Change-Id: Ifffc1cff878870f8152eb6ca0199c5d014b9cb07
2014-04-22 22:18:21 -07:00
Jeff Sharkey
846318a325 Allow prefix-based Uri permission grants.
Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments.  For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.

Allow persistable and prefix grants to be issued directly through
grantUriPermission().  Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.

Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key.  (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)

Fix revoke to always take away persisted permissions.  Move prefix
matching logic to Uri and add tests.  Add new flags to "am" tool, and
various internal uses around Intent and Context.  Switch some lagging
users to ArraySet.

Bug: 10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1
2014-04-22 21:06:49 -07:00
Craig Mautner
719e6b1670 Introduce PersistableBundle
The PersistableBundle class is similar to Bundle except that only
objects that have meaning across reboots can be stored and there
is a limited number of types that can be stored. More
specifically Binders, FileDescriptors, Parcelables, Booleans,
Bytes, Shorts, Chars, CharSequences, Floats, and ArrayLists
cannot be stored.

Fixes bug 13736007.

Change-Id: If6595b2e6fd92af6b7f60c4f7140ae867c258794
2014-04-22 19:15:33 -07:00
Youngsang Cho
ac27f9f488 am 6b2c07cb: Merge "Add overlay view in Tv Input Framework"
* commit '6b2c07cb3655b0f98990961e15c2b6077aaad5ca':
  Add overlay view in Tv Input Framework
2014-04-22 13:24:24 +00:00
Matthew Williams
6e31c5c82b TaskManager API first pass.
This is a very barebones first pass, meant to ensure we're all on the
same page, and also get feedback.

Change-Id: I7d5492dc5aafbe583f7c2d97ebf1444b6d2e068a
2014-04-21 19:57:49 -07:00
Youngsang Cho
6b2c07cb36 Merge "Add overlay view in Tv Input Framework" 2014-04-22 00:29:49 +00:00
Chris Craik
d6f3d5c977 am 908a2280: Merge "Add convenience methods to encourage usage of ALL_SAVE_FLAG"
* commit '908a228070678e901ff1775fdd1219f882e2d9fe':
  Add convenience methods to encourage usage of ALL_SAVE_FLAG
2014-04-18 22:36:47 +00:00
Chris Craik
908a228070 Merge "Add convenience methods to encourage usage of ALL_SAVE_FLAG" 2014-04-18 20:09:56 +00:00
Youngsang Cho
9a22f0f0a6 Add overlay view in Tv Input Framework
A TvInputService app developers sometimes want to draw UI above a surface
playing TV. For this purpose, we add a window in TIS and allow developers to
attach their customized view on the TV surface.

Change-Id: I65c3dffa17580b8d4c42fac58bbfc8dad338c185
2014-04-18 08:36:06 -07:00
Selim Gurun
292601f96f am 14cd25f6: Merge "Provide an API to set print document name."
* commit '14cd25f619fe981455aec9c79dc1abd89f4f5d8c':
  Provide an API to set print document name.
2014-04-18 14:53:41 +00:00
Selim Gurun
14cd25f619 Merge "Provide an API to set print document name." 2014-04-18 14:49:25 +00:00
Jeff Brown
6d74bc462c am aaea4d3a: am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit 'aaea4d3a4822a380831084a779f52a8e767ce402':
  Add support for dynamically setting the virtual display surface.
2014-04-17 23:06:00 +00:00
Jeff Brown
aaea4d3a48 am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '18a69b936afa6bdb8c65b6b582989c4dcdac45ee':
  Add support for dynamically setting the virtual display surface.
2014-04-17 22:59:59 +00:00
Jason Sams
c539b761e5 am 53ad3980: Merge "Unhide RenderScript resize intrinsic"
* commit '53ad398074bd9a0c54baab3d66d5842edb0733f8':
  Unhide RenderScript resize intrinsic
2014-04-17 22:46:58 +00:00
RoboErik
161bec6fe4 resolved conflicts for merge of 0a57a111 to master-nova
Change-Id: Id9fad51341239051203a219d58213b9438effc50
2014-04-17 15:43:15 -07:00
Jason Sams
53ad398074 Merge "Unhide RenderScript resize intrinsic" 2014-04-17 22:34:22 +00:00
RoboErik
0a57a1112f Merge "Add RouteProviders to the new Media APIs" 2014-04-17 22:13:30 +00:00
RoboErik
07c7077c54 Add RouteProviders to the new Media APIs
Compiles and works with OneMedia. This currently is a rough test of
the system for finding, connecting to, and sending messages to routes.
This will just connect to the first route it finds when a request to
open the route picker is made (and disconnect when another request is
made).

Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
2014-04-17 15:02:33 -07:00
Jeff Brown
18a69b936a am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev
* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
  Add support for dynamically setting the virtual display surface.
2014-04-17 21:53:34 +00:00
Chris Craik
c306ad61a7 Add convenience methods to encourage usage of ALL_SAVE_FLAG
Change-Id: I7a3bb2b83ca0463282764898e755b5f1a71ac557
2014-04-17 14:28:18 -07:00
Jason Sams
18033abaaf Unhide RenderScript resize intrinsic
Change-Id: I450c83ad00bcb7d999aaf7d4bd7ea88d63ab8fea
2014-04-17 13:52:26 -07:00
Raph Levien
2735a39c4e am 06136574: Merge changes Ia693f512,If3b7d41f
* commit '0613657426aecb7ed6141c133f100baf24166ae0':
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
2014-04-17 19:24:38 +00:00
Raph Levien
0613657426 Merge changes Ia693f512,If3b7d41f
* changes:
  Enable elegant text metrics in Quantum theme
  Add elegantTextHeight text appearance attribute
2014-04-17 19:21:14 +00:00
Raph Levien
53c0077256 Add elegantTextHeight text appearance attribute
This patch adds an elegantTextHeight text appearance attribute and
plumbs it through to the paint. This attribute selects the elegant
variant of fonts (when appropriate, which is typically Arabic and indic
scripts), and also specifies larger vertical metrics, to avoid clipping.

The intent is for this to be the default for quantum themes, but this
patch doesn't change any default behavior, just adds the attribute.

The larger vertical metrics are applied to top and bottom, but should
not affect line spacing in the common case. Also, with the setting,
metrics are no longer dependent on the font, so setting a custom font
will preserve layout and spacing.

Change-Id: If3b7d41f141deff50ca078f479ca90c2aa07829a
2014-04-17 11:16:46 -07:00
Chris Craik
7e9fe8548b am ddd4a9b9: Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""
* commit 'ddd4a9b9c329274d56a72d84f11dc0148215c406':
  Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
2014-04-17 18:13:40 +00:00
George Mount
bd032bf1dc am 99d2ffa1: Merge "Split Activity Transitions out of PhoneWindow."
* commit '99d2ffa1268da1258390fa6f272bf41687084d7b':
  Split Activity Transitions out of PhoneWindow.
2014-04-17 18:13:30 +00:00
Chris Craik
1dbe43ed69 am 0932cf87: Merge "Deprecate color array drawBitmap methods"
* commit '0932cf87c131f9238538fd7137b282adbe71dc37':
  Deprecate color array drawBitmap methods
2014-04-17 18:13:20 +00:00
Chris Craik
f570ae264e am 2632f197: Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
* commit '2632f19728e388b85ecb77095bbb4b0aa18b75e2':
  Add convenience methods, to encourage usage of ALL_SAVE_FLAG
2014-04-17 18:13:15 +00:00
Robin Lee
766a442a5e am 56a0a269: Merge "Allow ProfileOwner apps to manage app restrictions"
* commit '56a0a269cd7309476c5f49a21563249e97f70a9e':
  Allow ProfileOwner apps to manage app restrictions
2014-04-17 18:12:57 +00:00
Chris Craik
ddd4a9b9c3 Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"" 2014-04-17 17:06:22 +00:00
George Mount
99d2ffa126 Merge "Split Activity Transitions out of PhoneWindow." 2014-04-17 16:51:59 +00:00