Commit Graph

35322 Commits

Author SHA1 Message Date
destradaa
cc972725af Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework.
b/14118906

Change-Id: I4723a3b9cad99aacc70bd3b7b5b5e034aa6c033d
2014-04-25 11:39:16 -07:00
Amith Yamasani
250bb6e3e0 Merge "Allow profile owners to set user restrictions" 2014-04-25 18:23:37 +00:00
John Spurlock
b22aabbbd2 Merge "Introduce condition provider services." 2014-04-25 18:19:06 +00:00
Yuling Liang
2be1f8c3f4 am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit '69a9d92502428a4cf6eb6b5bf6577d9e525796a2':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
2014-04-25 17:38:00 +00:00
Yuling Liang
69a9d92502 am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev
* commit 'eea94f060a917a5c6195a81d8825551a430a8d69':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
2014-04-25 17:35:52 +00:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView"
This reverts commit a10e19845c.

Change-Id: I6d40451c9eb6285859e16d251b55947663a3553a
2014-04-25 17:32:08 +00:00
Alexandra Gherghina
d8e6a5f18a Merge "Temporarily switch off returning only enabled profiles to support dogfooding" 2014-04-25 17:12:44 +00:00
Alexandra Gherghina
92d6aea86e Temporarily switch off returning only enabled profiles to support dogfooding
Bug: 14132551
Change-Id: I3679c8fc248a799c816e5b80641b1fca6b7af061
2014-04-25 18:11:21 +01:00
Dianne Hackborn
522ff52f88 Merge "Initial implementation of new voice interaction API." 2014-04-25 17:02:19 +00:00
Selim Gurun
f9a031c134 Merge "Clarify a use case." 2014-04-25 16:44:10 +00:00
Yuling Liang
ec2b7d6dd7 am 60f8349b: am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '60f8349b9819130e81e28106a35bf3362d337045':
  Followon fix for 14276128 Clipping at bottom of TextView
2014-04-25 16:41:07 +00:00
Selim Gurun
f2d50e5536 Clarify a use case.
Clarify a use case regarding clearing client certificates.

Change-Id: Ifdfa00022bb21b26e6f62dbad585faef4f8fc3c7
2014-04-25 09:39:31 -07:00
John Spurlock
7340fc8665 Introduce condition provider services.
Add the condition provider interface, base class, and associated
system metadata.

Pull out common service management code into a reusable helper,
used by notification listeners and condition providers. The
helper, ManagedServices, is now completely self-contained - it
has no dependencies on NoMan or NoMan abstractions.

Bug:13743109
Change-Id: I6856d40f0a2ead78ac9b5707568559a57e7eb009
2014-04-25 12:35:31 -04:00
Yuling Liang
60f8349b98 am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '243e551ac380f86639eee3e95a482d8e17836670':
  Followon fix for 14276128 Clipping at bottom of TextView
2014-04-25 16:34:15 +00:00
Chris Craik
07f0b8ee73 Merge "Refactor Drawable outline production, flesh out Outline methods" 2014-04-25 16:22:26 +00:00
Colin Cross
c955677c1b fix build
When commit 4e48f40b03 merged from
AOSP it added a hunk that was already present.  Remove the second
copy.

Change-Id: I48b30fd5fe21d6668cc904744fed7d5044fae91d
2014-04-24 22:45:05 -07:00
Selim Gurun
da5c532573 am 7466e3bb: am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit '7466e3bbbd13b563e1a5adcc537ea0f132045038':
  Add a stub for forgotten callback to fix master-gpl.
2014-04-25 01:19:31 +00:00
Selim Gurun
7466e3bbbd am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit 'e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
  Add a stub for forgotten callback to fix master-gpl.
2014-04-25 01:15:36 +00:00
Selim Gurun
8c2d70f5e8 Merge "Add a stub for forgotten callback to fix master-gpl." 2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03 Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
2014-04-24 18:04:04 -07:00
Dianne Hackborn
91097de49b Initial implementation of new voice interaction API.
This gives a basic working implementation of a persist
running service that can start a voice interaction when
it wants, with the target activity(s) able to go through
the protocol to interact with it.  It may even work when
the screen is off by putting the activity manager in the
correct state to act like the screen is on.

Includes a sample app that is a voice interation service
and also has an activity it can launch.

Now that I have this initial implementation, I think I
want to rework some aspects of the API.

Change-Id: I7646d0af8fb4ac768c63a18fe3de43f8091f60e9
2014-04-24 17:48:58 -07:00
Selim Gurun
a697268442 am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl"
* commit 'f7a191731f6c840eed9283652648f267589502c2':
  Add a stub to fix master-gpl
2014-04-25 00:47:23 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
2014-04-24 17:31:07 -07:00
Christopher Tate
2ac0462e7b Merge "Send factory reset notification broadcasts at foreground priority" 2014-04-25 00:26:05 +00:00
Chris Craik
e6a39b1265 Refactor Drawable outline production, flesh out Outline methods
Change-Id: I1b8c25384b5f123e86cf5e0b2270eb741bc3159b
2014-04-24 16:58:18 -07:00
Dianne Hackborn
898be168bd Merge "Add support for muliple active development codenames." 2014-04-24 23:43:49 +00:00
Selim Gurun
7d5a5cbfd9 Merge "Add ClientCert support" 2014-04-24 23:26:09 +00:00
Winson Chung
67b082e02c Merge "Enabling doc centric recents on phones." 2014-04-24 23:24:40 +00:00
Amith Yamasani
be46532c9f Allow profile owners to set user restrictions
Pass the setting along to UserManager.

Fixes a security exception when fetching the profile's enabled state.

Change-Id: If71698cf32c52cce1158cf2027443a339bc58488
2014-04-24 16:24:13 -07:00
Dianne Hackborn
ffcda10861 Add support for muliple active development codenames.
The resource API level is also bumped by the number of
active codenames there are.

Change-Id: Ic1bac452d5c13dc3f48040ffa47f54b28abe2ccc
2014-04-24 16:18:43 -07:00
Christopher Tate
e27ae55d6d Send factory reset notification broadcasts at foreground priority
Bug 14296706

Change-Id: I07b39e808dbf724f5edd4a11445de3e47c9e862b
2014-04-24 15:13:13 -07:00
Chris Craik
06916dcb05 Merge "Add floats-only drawRoundRect to Canvas" 2014-04-24 21:56:41 +00:00
Selim Gurun
b6aa97e0a0 Add ClientCert support
Bug: 12983007

This is to add APIs for client certificates. Keep the APIs hidden
until finalizing the design.

Change-Id: I8a1e755e2c509cf821dff7c7df0ddd5270a5f79b
2014-04-24 14:27:33 -07:00
Chris Craik
4d1c1538e2 Add floats-only drawRoundRect to Canvas
Change-Id: Ib0033a2d2486a808a44984ec4adf7fef76d9ea17
2014-04-24 14:23:52 -07:00
Raph Levien
a10e19845c Followon fix for 14276128 Clipping at bottom of TextView
The previous fix did not work when the text was ellipsized, because the
test for whether the line was the last line was incorrect. The new test
handles both the end of the buffer and the case where it is the last
line because of ellipsizing.

So this should be the proper fix for bug 14276128 Clipping at bottom of
TextView when lineSpacingMultiplier < 1

Change-Id: Iac5c96f2273142031c18a27f504f7d6d5fcf823e
2014-04-24 20:00:05 +00:00
Jeff Davidson
ede08340e1 Merge "API tweaks for network score settings." 2014-04-24 18:58:56 +00:00
Dianne Hackborn
806047caca Merge "Start collecting mobile radio activity from the radio." 2014-04-24 18:28:32 +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
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
Jeff Davidson
ee2a1219d3 API tweaks for network score settings.
Expose "isAppValidScorer" so Settings can call it.

Also rename ACTION_CHANGE_DEFAULT to ACTION_CHANGE_ACTIVE for
consistency with other naming.

Change-Id: I6c2d0099622958f06c2916ca76090e14d5273c86
2014-04-24 09:33:27 -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
03981a4c2e Merge "Add activity attribute allowEmbedded" into klp-modular-dev 2014-04-24 16:30:14 +00:00
Raph Levien
79cb5505a9 am 07bed492: am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit '07bed4921a05e717a4b7f10a25e3830e346426b7':
  Fix bug 14276128 Clipping at bottom of TextView
2014-04-24 16:25:21 +00:00
Raph Levien
07bed4921a am e4ee0e31: Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev
* commit 'e4ee0e3193f8e66cabc5352046969041ad4921e5':
  Fix bug 14276128 Clipping at bottom of TextView
2014-04-24 16:18:08 +00:00
Raph Levien
e4ee0e3193 Merge "Fix bug 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-24 16:12:54 +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
Alexandra Gherghina
e255d7399f Merge "Modify getUserProfiles to return only enabled profiles:" 2014-04-24 15:22:09 +00:00