Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
132,191 Commits 3 Branches 0 Tags
1d98bd899e850ab93c39156a3c79da9d7a600849
Commit Graph

38744 Commits

Author SHA1 Message Date
destradaa
1d98bd899e am 3e446afc: Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 
* commit '3e446afc380db206547d9f1f8f9bd60cf48aa100':
  Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906
 2014-04-25 21:25:11 +00:00
destradaa
08f15963fe Merge "Make sure FLP HAL statuses currently used are translated (if needed) correctly into the framework. b/14118906" 2014-04-25 21:21:37 +00:00
Kenny Guy
58b305bb00 am 0ec41abf: Merge "Provide access to ActivityInfo.name from LauncherActivityInfo" 
* commit '0ec41abf20df9c27cd995b8ca22fa709aff4434b':
  Provide access to ActivityInfo.name from LauncherActivityInfo
 2014-04-25 20:33:55 +00:00
Kenny Guy
86a6430e52 Provide access to ActivityInfo.name from LauncherActivityInfo 
Change-Id: Ia34900f3e232b59f3879dbb3cb3131498023b8ac
 2014-04-25 21:21:55 +01:00
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
9c28d12f48 am b5b77c47: Merge "Allow profile owners to set user restrictions" 
* commit 'b5b77c47c4dc41b75e73b42378d3c63647ac4fd0':
  Allow profile owners to set user restrictions
 2014-04-25 18:28:25 +00:00
Amith Yamasani
250bb6e3e0 Merge "Allow profile owners to set user restrictions" 2014-04-25 18:23:37 +00:00
John Spurlock
ff1005a6f5 am 7745fb9e: Merge "Introduce condition provider services." 
* commit '7745fb9e95b6938591a46ffcaace8db02c93962f':
  Introduce condition provider services.
 2014-04-25 18:21:40 +00:00
John Spurlock
b22aabbbd2 Merge "Introduce condition provider services." 2014-04-25 18:19:06 +00:00
Yuling Liang
35e990ce32 am 7b3e16ef: am 69a9d925: am eea94f06: Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 
* commit '7b3e16ef730e694e9d1fbd73bee35f4d69ba5401':
  Revert "Followon fix for 14276128 Clipping at bottom of TextView"
 2014-04-25 17:41:48 +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
ded34b77ee am a30c2028: Merge "Temporarily switch off returning only enabled profiles to support dogfooding" 
* commit 'a30c20287ce2f6dd15bc402b66e5d5721ad65699':
  Temporarily switch off returning only enabled profiles to support dogfooding
 2014-04-25 17:18:22 +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
1b27c34fb6 am ed407e04: Merge "Initial implementation of new voice interaction API." 
* commit 'ed407e046e63ca1d22a1d9206e2ad558bf821525':
  Initial implementation of new voice interaction API.
 2014-04-25 17:05:58 +00:00
Dianne Hackborn
522ff52f88 Merge "Initial implementation of new voice interaction API." 2014-04-25 17:02:19 +00:00
Selim Gurun
379a7473a9 am 8e570eeb: Merge "Clarify a use case." 
* commit '8e570eeb4a2c9030bed88865def37b6d24c3e32e':
  Clarify a use case.
 2014-04-25 16:49:35 +00:00
Yuling Liang
59e3b2f3d2 am c58eed99: am 60f8349b: am 243e551a: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit 'c58eed991e8a1749a2acdc9c11bfcc445bac84be':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-25 16:45:18 +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
a5826864ed am 2cfb1caa: Merge "Refactor Drawable outline production, flesh out Outline methods" 
* commit '2cfb1caaddd33f768a1fb66a82f373469da995f5':
  Refactor Drawable outline production, flesh out Outline methods
 2014-04-25 16:26:21 +00:00
Chris Craik
07f0b8ee73 Merge "Refactor Drawable outline production, flesh out Outline methods" 2014-04-25 16:22:26 +00:00
Colin Cross
3b687a155d am c955677c: fix build 
* commit 'c955677c1b2e03ad048e034bd033dd66dfd72ef3':
  fix build
 2014-04-25 16:17:39 +00:00
Selim Gurun
4b0d678d08 am da5c5325: am 7466e3bb: am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit 'da5c532573bcdd1698822384e9e20d7e64195987':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 16:17:14 +00:00
Christopher Tate
a566a98de9 am 2ac0462e: Merge "Send factory reset notification broadcasts at foreground priority" 
* commit '2ac0462e7bdf0f7cfc8163bfa31cf4a90161a879':
  Send factory reset notification broadcasts at foreground priority
 2014-04-25 16:08:47 +00:00
Dianne Hackborn
6f467d3e43 am 898be168: Merge "Add support for muliple active development codenames." 
* commit '898be168bda75b204611e8e24439d33213ecab5f':
  Add support for muliple active development codenames.
 2014-04-25 16:08:31 +00:00
Selim Gurun
65fb1dafe4 am 7d5a5cbf: Merge "Add ClientCert support" 
* commit '7d5a5cbfd96610cfe6ad7f1760e24284d6c8e168':
  Add ClientCert support
 2014-04-25 16:08:20 +00:00
Winson Chung
0aed0dd40a am 67b082e0: Merge "Enabling doc centric recents on phones." 
* commit '67b082e02cbfb7bafe046a619e686e9a5c1abc05':
  Enabling doc centric recents on phones.
 2014-04-25 16:08:17 +00:00
Chris Craik
3b951a2190 am 06916dcb: Merge "Add floats-only drawRoundRect to Canvas" 
* commit '06916dcb05eeee8c809bb18d170a3f73b5ee1427':
  Add floats-only drawRoundRect to Canvas
 2014-04-25 15:52:52 +00:00
Jeff Davidson
004ab8cc95 am ede08340: Merge "API tweaks for network score settings." 
* commit 'ede08340e1ac6b783cba52944474c28013f59cf9':
  API tweaks for network score settings.
 2014-04-25 15:51:47 +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