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

49670 Commits

Author SHA1 Message Date
Dianne Hackborn
ab5c0ea43c Add IBatteryStats API to retrieve current charge times. 
Also include charge/discharge information in dumpsys.

Change-Id: Ica1b333ad334dc698d4a67da391b378757662f41
 2014-04-29 14:53:32 -07:00
George Mount
6eb2bc52a5 Merge "Add ability to exclude Views in transition XML." 2014-04-29 20:49:26 +00: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
George Mount
f976c3d42b Add ability to exclude Views in transition XML. 
Bug 14259955

Change-Id: I47bb10c530c9fec8910ddd96156fc38d6027e1f6
 2014-04-29 13:08:33 -07: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
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
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
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
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
c4e6f6d282 am cf939672: am 2e9d924d: Merge "Remove unused import." 
* commit 'cf939672f8c6e1ee29ae38f0e3665ab966491f7f':
  Remove unused import.
 2014-04-29 04:01:25 +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
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
Elliott Hughes
f97c63350a Move internal libcore.os users over to android.system. 
Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
 2014-04-28 16:38:43 -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
Yuling Liang
54dacbe7ca am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '3914a33c01102f5de51e33d006c0aeedf2693af0':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-28 23:22:54 +00:00
Yuling Liang
3914a33c01 am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit '26a5c2dd740f309f3168790fc55a164738963835':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-28 23:18:58 +00:00
Yuling Liang
26a5c2dd74 Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 2014-04-28 23:16:13 +00:00
Chris Craik
139349b7de Merge "Add elevation, Z properties to View" 2014-04-28 23:03:42 +00:00
Eino-Ville Talvala
967c4354be Merge "CameraDevice: Make sure log tags are within length bounds." 2014-04-28 22:28:55 +00:00
Eino-Ville Talvala
b72d1efdef CameraDevice: Make sure log tags are within length bounds. 
Change-Id: I93c4670c1ee0b0be5956b0ed8cd0f53873257f7c
 2014-04-28 15:23:43 -07:00
Chris Craik
cc39e16cb9 Add elevation, Z properties to View 
Change-Id: I3dd3b683a66e248a0fdf2ca69d1e962615b0daf9
 2014-04-28 14:33:33 -07:00
Yorke Lee
2e9c300b91 Merge "Add setOverlay method to QuickContactsBadge" 2014-04-28 21:24:21 +00:00
Griff Hazen
7c12112d62 am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit 'e638b84436caeea8d54b560c0b883ef599ba328d':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 21:21:10 +00:00
Adam Lesinski
1ebf4ef188 Merge "Merge commit '734a78fb' into manualmerge" 2014-04-28 21:20:01 +00:00
Bo Liu
802667b20b Merge "Add invokeFunctor call to ViewRootImpl" 2014-04-28 21:16:14 +00:00
Adam Lesinski
e929bee9bb Merge commit '734a78fb' into manualmerge 
Conflicts:
	core/java/android/app/WallpaperManager.java

Change-Id: Id103f540329ea484ff2e0829a0fc8158621f3dd3
 2014-04-28 14:15:06 -07:00
Elliott Hughes
812ad2265e am d937f275: am 12928a07: am 2336c4ec: Merge "Fix build." 
* commit 'd937f2750c6edc2c1a03901605b22dad02b89147':
  Fix build.
 2014-04-28 21:02:17 +00:00
Yorke Lee
a702ccdf9f Add setOverlay method to QuickContactsBadge 
Allow apps to disable/configure their own overlay to be used
on the QuickContactsBadge

Bug: 13747208

Change-Id: Id84c6ee1ebde6ce17477c12d22522ca19c27ea9b
 2014-04-28 13:57:04 -07:00
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master 
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
 2014-04-28 13:53:25 -07:00
Bo Liu
ae738a7a45 Add invokeFunctor call to ViewRootImpl 
BUG: 13961296

Change-Id: Ief8eea0b4c79a64ea76d75daaec176f1b8438581
 2014-04-28 13:41:18 -07:00
Griff Hazen
e638b84436 am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '3c5a6cf93520be23e6d5a9bc4cb8f4e8c18214b1':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:37:24 +00:00
Yohei Yukawa
b609ea3884 Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT" 2014-04-28 20:33:26 +00:00
Griff Hazen
3c5a6cf935 am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '2c6131bba957dc5b4e1638bb8b0c10ebddf2049a':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:33:22 +00:00
Adam Lesinski
734a78fb86 am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev 
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
  Various CTS fixes
 2014-04-28 20:33:09 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Alan Viverette
a1a680480e Fix alert dialog icon 
Previously, failing to call setIcon() would result in a blank icon
rather than hiding the icon. Also, calling setIcon(icon) followed by
setIcon(null) could be a no-op depending on whether the alert had
already been constructed.

Change-Id: I65a96a4e89b9eac1123cbbf5d57e7e366e7b4d4e
 2014-04-28 13:30:08 -07:00