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

129223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
c862054b9e Merge "Subscribe to default zen mode condition." 2014-04-29 20:33:47 +00:00
John Spurlock
dbb22bcd3f Subscribe to default zen mode condition. 
Otherwise re-opening the current QS panel does not force an unsubscribe
(if a non-default condition was subscribed).

Change-Id: I1ec2519cc051d435c2ebbe8cea4a9b54f256820d
 2014-04-29 16:31:13 -04:00
Jae Seo
994925d666 Merge "Add more URI patterns for accessing TV metadata" 2014-04-29 20:21:51 +00:00
Zhijun He
896c330445 Merge "Camera2: Update availableFormats related key docs" 2014-04-29 20:16:02 +00:00
Deepanshu Gupta
7592afeaa0 Merge "Add special system view cookie to OverflowButton." 2014-04-29 19:54:25 +00:00
Zhijun He
a4d0a8fb20 Camera2: Update availableFormats related key docs 
Change-Id: I1cd2a39ee6a4d3ec391fa827accaa8ad1b3dfc6e
 2014-04-29 12:35:27 -07:00
Chris Craik
f38475bc28 Merge "Add Z property to View" 2014-04-29 19:24:47 +00:00
Selim Gurun
76b81c7221 am 2e3b36a2: (-s ours) am c23f5651: (-s ours) am 5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub" 
* commit '2e3b36a2713b7b100172f91ab019d7bd256365f1':
  DO NOT MERGE Add invokeFunctor stub
 2014-04-29 18:52:21 +00:00
Selim Gurun
2e3b36a271 am c23f5651: (-s ours) am 5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub" 
* commit 'c23f5651fd40eca1b751376c369fd9f3c9deb64e':
  DO NOT MERGE Add invokeFunctor stub
 2014-04-29 18:49:24 +00:00
Selim Gurun
c23f5651fd am 5c220cc4: (-s ours) Merge "DO NOT MERGE Add invokeFunctor stub" 
* commit '5c220cc4e4c0584a9083529b58e30e17ab7d2d9e':
  DO NOT MERGE Add invokeFunctor stub
 2014-04-29 18:45:53 +00:00
Selim Gurun
5c220cc4e4 Merge "DO NOT MERGE Add invokeFunctor stub" 2014-04-29 18:42:25 +00:00
Bo Liu
02931d9af6 DO NOT MERGE Add invokeFunctor stub 
Change-Id: Ib7637d68c4f63065b909075a8f5d8cd1dd0674bd
 2014-04-29 11:38:37 -07:00
Dianne Hackborn
1de6b101e5 Merge "Implement better computing of battery drain time, actual charge time." 2014-04-29 18:30:08 +00:00
Dianne Hackborn
260c5020ae Implement better computing of battery drain time, actual charge time. 
Also move time formatter in to framework for use elsewhere.

Change-Id: I42b6a44414b68754af65c522bef5591da5643909
 2014-04-29 11:23:16 -07:00
Kenny Root
a8e65fd82a Only remember the signer certificates for Signatures 
Previously we would use the JarEntry#getCertificates API which would
return a flattened array of all the signers and their certificate chain.
Since this isn't what was intended, switch to reading the certificate
chains and only paying attention to the signer certificate.

In order to migrate during upgrades of the platform, we'll scan on boot
with a compatibility mode which will check the stores signatures in the
old format by flattening the chains of the scanned packages then
comparing the two sets.

Bug: 13678484
Change-Id: I02a5c53121d8d6f70a51d7e3b98168a41e11482e
 2014-04-29 11:08:50 -07:00
John Reck
25ff2c1ec1 Merge "RenderThread animator support" 2014-04-29 17:56:04 +00:00
John Reck
e45b1fd03b RenderThread animator support 
Change-Id: Icf29098edfdaf7ed550bbe9d49e9eaefb4167084
 2014-04-29 10:42:11 -07:00
ztenghui
0d575b084f Merge "Make sure the theta is correctly represented and incoming polygon is CW for shadow." 2014-04-29 16:21:51 +00:00
Glenn Kasten
ecdc6fdb64 Merge "Add CHANNEL_OUT_QUAD_SIDE and CHANNEL_OUT_5POINT1_SIDE" 2014-04-29 16:14:43 +00:00
Selim Cinek
8efc566abf Merge "Fixed a bug where the outline was not correctly updated" 2014-04-29 15:57:02 +00:00
Selim Cinek
61571f1422 Fixed a bug where the outline was not correctly updated 
The outline was not correctly copied to the field when it already
existed.

Change-Id: I02a7006f7ceff9241b1c52c73ea159c59aa7464e
 2014-04-29 14:41:36 +02:00
Nicolas Prevot
627aad9c20 Merge "Small fix in DeviceOwner.java." 2014-04-29 10:35:26 +00:00
Nicolas Prevot
f2a5bf88cd Small fix in DeviceOwner.java. 
Change-Id: Ibfa4ae7b1bc269bc51532026f8a6cc3c75cc42bf
 2014-04-29 10:43:53 +01:00
Jae Seo
19db0f036a Merge "Dispatch input events to the TV input" 2014-04-29 06:22:00 +00:00
Jae Seo
6a6059a29e Dispatch input events to the TV input 
TvInputManagerService now creates an InputChannel pair and passes one
end to the app and the other end to the service. Then the TvInputManager
in the app creates an InputEventSender around one end of the channel to
send events and the service creates an InputEventReceiver around the
other end of the channel to receive events.
Most of the newly added code here was borrowed heavily from the IME.

Change-Id: I0bd83847cba0033ccb6f4b6dad267ebeaf5e9c7c
 2014-04-29 14:18:55 +09:00
Elliott Hughes
a77a88e436 am 45641ecd: am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports." 
* commit '45641ecd2c4be60390319614f519d2313dbd547d':
  Fix two zygote imports.
 2014-04-29 04:09:43 +00:00
Elliott Hughes
bafab83995 am c4e6f6d2: am cf939672: am 2e9d924d: Merge "Remove unused import." 
* commit 'c4e6f6d2827ad526f562a5882975f42eee69486c':
  Remove unused import.
 2014-04-29 04:05:27 +00:00
Elliott Hughes
45641ecd2c am 7af8f5ba: am 10d57c4b: Merge "Fix two zygote imports." 
* commit '7af8f5ba9cc7801fabe70bcf13e602aaa73dc428':
  Fix two zygote imports.
 2014-04-29 04:05:25 +00:00
Elliott Hughes
c4e6f6d282 am cf939672: am 2e9d924d: Merge "Remove unused import." 
* commit 'cf939672f8c6e1ee29ae38f0e3665ab966491f7f':
  Remove unused import.
 2014-04-29 04:01:25 +00:00
Elliott Hughes
7af8f5ba9c am 10d57c4b: Merge "Fix two zygote imports." 
* commit '10d57c4bc7459d0c73b254af006a3528e9a0c33e':
  Fix two zygote imports.
 2014-04-29 04:01:01 +00:00
Elliott Hughes
cf939672f8 am 2e9d924d: Merge "Remove unused import." 
* commit '2e9d924d4f4275c72df4be28d85482064cee43f8':
  Remove unused import.
 2014-04-29 03:56:19 +00:00
Elliott Hughes
10d57c4bc7 Merge "Fix two zygote imports." 2014-04-29 03:54:49 +00:00
Elliott Hughes
a9569ff70f Fix two zygote imports. 
Change-Id: I5eea2d9f48479c33e1594aaa259274e5e787a1df
 2014-04-28 20:53:52 -07:00
Elliott Hughes
2e9d924d4f Merge "Remove unused import." 2014-04-29 03:52:11 +00:00
Elliott Hughes
f25f14eeba Remove unused import. 
Change-Id: I3f6a035cda55859a7a521f3117da72ee962beb63
 2014-04-28 20:51:34 -07:00
Elliott Hughes
c1858228df Fix a few more stray libcore.io references. 
Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
 2014-04-28 20:49:24 -07:00
Elliott Hughes
33ee1e779d Fix build. 
Change-Id: I9e1a5280d3356e8814e505915bbc74200bc58b40
 2014-04-28 20:45:31 -07:00
Elliott Hughes
20cfa1b36c am 3e792ef7: am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit '3e792ef78fbad1df75e97da9a32a5826371b2da9':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:38:02 +00:00
Elliott Hughes
3e792ef78f am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'fff28619d8f3b2fa7577c3e101d3fcd45f26f3a4':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:34:37 +00:00
Elliott Hughes
fff28619d8 am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'f4a7ac00a734343b8d2760def352cbdf99fa08c7':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:31:34 +00:00
Elliott Hughes
f4a7ac00a7 Merge "Move the Zygote off libcore.os and onto android.system." 2014-04-29 02:28:07 +00:00
Elliott Hughes
860c5911a2 Move the Zygote off libcore.os and onto android.system. 
Change-Id: Iaa20e50b05fad355bdf15bcfdc58efc9941c400c
 2014-04-28 19:19:13 -07:00
Alan Viverette
b6093740db Merge "Fix alert dialog icon" 2014-04-29 00:13:36 +00:00
Chris Craik
9103e4f748 Add Z property to View 
Change-Id: Iff0b2fc616c650c46e5567a1cc81301afffcbfce
 2014-04-28 17:00:44 -07:00
ztenghui
2e023f3827 Make sure the theta is correctly represented and incoming polygon is CW for shadow. 
Now the theta = 0 should be on +x axis.
And cos(theta) should correctly represent x value.
Without this fix, the poly theta (from atan2) can be wrongly rotated 90 degrees.

Also, make sure the incoming polygon is CW for the shadow system.
This fix visual artifacts in recent regression for spot shadows.

bug:13553955

Change-Id: I9bbf54db094e7f133326da4dae4610962da849c1
 2014-04-28 16:43:13 -07:00
Winson Chung
7a70981fc1 Merge "Fixing NPE. (Bug 14385152)" 2014-04-28 23:43:04 +00:00
Elliott Hughes
74af8b54b3 Merge "Move internal libcore.os users over to android.system." 2014-04-28 23:40:05 +00:00
Elliott Hughes
f97c63350a Move internal libcore.os users over to android.system. 
Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
 2014-04-28 16:38:43 -07:00
Chris Craik
5830df4d59 Fix build 
Change-Id: I4f55b27425899f25cb22d4466e3413ad27b5a302
 2014-04-28 16:38:31 -07:00
Jae Seo
cdf6bd22e0 Add more URI patterns for accessing TV metadata 
The following URI patterns are added:
  content://com.android.tv/input/*/*/channel
  content://com.android.tv/input/*/*/channel?browsable_only=
  content://com.android.tv/channel/#/program
  content://com.android.tv/channel/#/program?start_time=&end_time=

This allows us to disable user-provided selection on query/delete/update to help
avoid SQL injection.

Bug: 14133838
Change-Id: I6c86ac33cb5bc8aaa5248a80ed0f0fe0899a15b8
 2014-04-29 08:28:44 +09:00