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

129198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
e45b1fd03b RenderThread animator support 
Change-Id: Icf29098edfdaf7ed550bbe9d49e9eaefb4167084
 2014-04-29 10:42:11 -07: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
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
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
David Friedman
23962cb7db am 86318b7d: am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '86318b7daae6a741cf18c8a37297f978d5e5e42a':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:11:36 +00:00
David Friedman
86318b7daa am 0c18705b: am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '0c18705bf10e1e04fbb2b2afaf5f9537764148a5':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:07:40 +00:00
Chris Craik
139349b7de Merge "Add elevation, Z properties to View" 2014-04-28 23:03:42 +00:00
David Friedman
0c18705bf1 am 3fef8e60: am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '3fef8e60668bb955763367ac17c1195e46b3078c':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:03:25 +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
Winson Chung
648c83b4ee Fixing NPE. (Bug 14385152) 
Change-Id: Ie6d1e7c3e5dcf721e945c4933c077fa6abb10067
 2014-04-28 15:11:56 -07:00
David Friedman
3fef8e6066 am 1053b2c5: Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 
* commit '1053b2c5d43ca58e9f0fe611770b278e88c76fa3':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 21:56:07 +00:00
David Friedman
1053b2c5d4 Merge "Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html" into klp-docs 2014-04-28 21:52:45 +00: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