drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,057 Commits 1 Branch 0 Tags
Commit Graph

129057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
a466b101be Merge "PackageManager: add versioning to packages.xml file" 2014-04-25 22:09:25 +00:00
Adam Powell
07064fa730 Merge "Fix ScrollView nested scrolling with touch down on buttons" 2014-04-25 21:34:32 +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
Adam Powell
e9a16a5a3e Fix ScrollView nested scrolling with touch down on buttons 
Start ScrollView's nested scroll in onIntercept to signal nested
scrolling parents not to intercept along the vertical axis.

Change-Id: Ieb343ff6b8216b113d3876bf93a804e609257f2a
 2014-04-25 14:21:27 -07:00
Kenny Guy
e22d3e201e Merge "Provide access to ActivityInfo.name from LauncherActivityInfo" 2014-04-25 20:28:13 +00:00
Adam Lesinski
c029d5f988 Merge "Child nodes of <preference-headers> now output proguard keep options." 2014-04-25 20:25:24 +00:00
Winson Chung
4553b2d7c8 Merge "Updating recent tasks list in response to package events. (Bug 14260718)" 2014-04-25 20:22:31 +00:00
Kenny Guy
86a6430e52 Provide access to ActivityInfo.name from LauncherActivityInfo 
Change-Id: Ia34900f3e232b59f3879dbb3cb3131498023b8ac
 2014-04-25 21:21:55 +01:00
Zhijun He
50ec7cbf9f Merge "ImageReader: remove RAW_SENSOR format translation" 2014-04-25 19:44:20 +00:00
John Spurlock
47ffde252e Merge "Delay settings panel visibility until touch slop exceeded." 2014-04-25 18:53:16 +00: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
Adam Lesinski
9cf4b4a932 Child nodes of <preference-headers> now output proguard keep options. 
Bug:13797600
Change-Id: I55c71a2fcf7f9b4bdad684d5c235981c3a8bc1e9
 2014-04-25 11:37:23 -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
Winson Chung
8faa342c8a Updating recent tasks list in response to package events. (Bug 14260718) 
Change-Id: I7e887256b2d504aebfaedcfebb5ee8a40b05fe24
 2014-04-25 10:53:57 -07: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
eea94f060a Merge "Revert "Followon fix for 14276128 Clipping at bottom of TextView"" into klp-modular-dev 2014-04-25 17:32:28 +00:00
Yuling Liang
10973c7776 Revert "Followon fix for 14276128 Clipping at bottom of TextView" 
This reverts commit a10e19845ce76c0e4dd38018c84b83c9255dc9fe.

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
Allen Hair
24a4ce3566 Merge "Fix nativeGetAnimationFrameStats to use the correct times." 2014-04-25 16:59:21 +00:00
Allen Hair
7659093187 Merge "Fixed shell manifest to use correct permission." 2014-04-25 16:57:35 +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
Yuling Liang
243e551ac3 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-25 16:30:12 +00:00
Chris Craik
07f0b8ee73 Merge "Refactor Drawable outline production, flesh out Outline methods" 2014-04-25 16:22:26 +00:00
John Spurlock
4e9d7c1797 Delay settings panel visibility until touch slop exceeded. 
Bug:14271219
Change-Id: Ic8f36670f8d56f74a383ca7a867b69c7568a7250
 2014-04-25 12:18:46 -04:00
Kenny Root
c1c0d3c4f4 PackageManager: add versioning to packages.xml file 
During development, a new feature might be added that requires the
packages.xml format be updated. To that end, add a database version
attribute that allows this to happen.

Change-Id: I3340a0bd55017acd625c3cba523cec10a18a4805
 2014-04-25 09:08:32 -07:00
Marco Nelissen
c806d5393f am ebd6a2d2: am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'ebd6a2d2710ebf7196a399d6d5a2f0745844310b':
  Release DrmManagerClient resources
 2014-04-25 14:55:11 +00:00
Marco Nelissen
ebd6a2d271 am eded9e3b: am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'eded9e3b7f6f30526365461a25624b841611af28':
  Release DrmManagerClient resources
 2014-04-25 14:52:18 +00:00
Marco Nelissen
eded9e3b7f am adcf38c9: Merge "Release DrmManagerClient resources" 
* commit 'adcf38c9936fa372309d413cec03a1413e797c7a':
  Release DrmManagerClient resources
 2014-04-25 14:46:35 +00:00
Marco Nelissen
adcf38c993 Merge "Release DrmManagerClient resources" 2014-04-25 14:42:02 +00:00
Jungshik Jang
a77f358eed Merge "Implement skeleton of new HDMI Control Service." 2014-04-25 14:09:18 +00:00
Jorim Jaggi
1578e08db4 Merge "Attempt to fix blank lockscreen." 2014-04-25 13:13:12 +00:00
Jorim Jaggi
c357ca2013 Attempt to fix blank lockscreen. 
Bug: 14280857
Change-Id: Icf458040b1a0b0a412981acf7b522d04c046a5f8
 2014-04-25 14:56:15 +02:00
Colin Cross
c955677c1b fix build 
When commit 4e48f40b0384110082bec52caf38d2d47ce505f5 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
Craig Mautner
3ce4bd3e71 am e5889679: am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit 'e5889679f69c93f85bca9e94710d5e60a0b1a629':
  Too soon.
 2014-04-25 03:10:13 +00:00
Craig Mautner
e5889679f6 am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.
 2014-04-25 03:06:34 +00:00
Craig Mautner
3a656ea32e Merge "Too soon." into klp-modular-dev 2014-04-25 03:03:37 +00:00
Craig Mautner
2e46e65e9d Too soon. 
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
 2014-04-25 03:01:40 +00:00
Elliott Hughes
b1b484aab3 Merge "Track package change." 2014-04-25 02:06:39 +00:00
Elliott Hughes
96472bec78 Track package change. 
Change-Id: I6a8123d8e69367fc1ce27bac46c4bcec489d73ba
 2014-04-24 19:05:43 -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
e3fc307382 am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl." 
* commit '8c2d70f5e8dfe64213f44c29562fe4240779b68b':
  Add a stub for forgotten callback to fix master-gpl.
 2014-04-25 01:12:46 +00:00