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

132369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
7c4d03e694 am f5a29f59: am 3e792ef7: am fff28619: am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system." 
* commit 'f5a29f592abc0d09ab94ab5e69ffbd4f4a87db16':
  Move the Zygote off libcore.os and onto android.system.
 2014-04-29 02:40:30 +00: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
a21491bba0 am d7f5ba85: Merge "Fix alert dialog icon" 
* commit 'd7f5ba85e19bcd0416014864e560fd0cc3982949':
  Fix alert dialog icon
 2014-04-29 00:20:12 +00:00
Alan Viverette
b6093740db Merge "Fix alert dialog icon" 2014-04-29 00:13:36 +00:00
Winson Chung
2bed73cadb am f1866291: Merge "Fixing NPE. (Bug 14385152)" 
* commit 'f18662919de3bb81246ada6196e6c2ebac0360df':
  Fixing NPE. (Bug 14385152)
 2014-04-28 23:48:08 +00:00
Elliott Hughes
2b4edabd6a am 7221fa28: Merge "Move internal libcore.os users over to android.system." 
* commit '7221fa288089572b0f1ae16739deebe0d057f26d':
  Move internal libcore.os users over to android.system.
 2014-04-28 23:43:59 +00:00
Chris Craik
e3bd1a9a25 am dced3e9a: Fix build 
* commit 'dced3e9a8b0bd01d5605a2592304f091fc0b8aab':
  Fix build
 2014-04-28 23:43:56 +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
f2231eb0a1 am de4054bb: am 3914a33c: am 26a5c2dd: Merge "Followon fix for 14276128 Clipping at bottom of TextView" into klp-modular-dev 
* commit 'de4054bba780e67d2f24ba52c5bc8e5a16d5bddc':
  Followon fix for 14276128 Clipping at bottom of TextView
 2014-04-28 23:28:36 +00: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
549e0a085b am bed34634: 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 'bed34634ec9dc3077022f5650d56aec00968536e':
  Fixed missing line break, broken link. Bug: 13975265 Staged at: http://boku:9195/guide/topics/manifest/manifest-element.html
 2014-04-28 23:16:00 +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
Chris Craik
ceeccd434c am 40310481: Merge "Add elevation, Z properties to View" 
* commit '403104813cb424ae28df6b4245bafaab21969917':
  Add elevation, Z properties to View
 2014-04-28 23:07:59 +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
81356bb398 am b79b4307: Merge "CameraDevice: Make sure log tags are within length bounds." 
* commit 'b79b4307983c43614a5cd35a08c8444493abae79':
  CameraDevice: Make sure log tags are within length bounds.
 2014-04-28 22:33:57 +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
fedd55a424 am a6521d78: Merge "Add setOverlay method to QuickContactsBadge" 
* commit 'a6521d78a4ce3c273b241eed214c85ec12a30d32':
  Add setOverlay method to QuickContactsBadge
 2014-04-28 21:31:31 +00:00
Griff Hazen
48f04a845b am 58ba9f2d: am e638b844: am 3c5a6cf9: am 2c6131bb: am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '58ba9f2db123e216a262fae5e276ec9f394e42f8':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 21:31:24 +00:00
Adam Lesinski
448b130c12 am d15388df: Merge "Merge commit \'734a78fb\' into manualmerge" 
* commit 'd15388dfe12938c95f52aba1cb41ec58ad1e5e84':
  Various CTS fixes
 2014-04-28 21:31:21 +00:00
Yorke Lee
2e9c300b91 Merge "Add setOverlay method to QuickContactsBadge" 2014-04-28 21:24:21 +00:00
Bo Liu
3a915af6a2 am caffba94: Merge "Add invokeFunctor call to ViewRootImpl" 
* commit 'caffba94e9e7cf8a798675b05815e578cbe72ffd':
  Add invokeFunctor call to ViewRootImpl
 2014-04-28 21:22:17 +00:00
Elliott Hughes
21f64834bd am d68e252e: am d937f275: am 12928a07: am 2336c4ec: Merge "Fix build." 
* commit 'd68e252e424e894eeef17b4bd8f4e89f33a31bc4':
  Fix build.
 2014-04-28 21:22:12 +00:00
Elliott Hughes
d9e6101862 am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master 
* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
  Track libcore.os' move to android.system.
 2014-04-28 21:22:01 +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
Yohei Yukawa
8f6278df67 am 5fe51516: Merge "Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT" 
* commit '5fe51516d07dc1a4fb54c968b7f11c4a6f4b8cbf':
  Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT
 2014-04-28 20:38:21 +00:00
Mathieu Chartier
d122c94931 am d4b2046e: am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit 'd4b2046efbfa300263df5c0901b7b24c97bf11cd':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 20:38:15 +00:00
Alan Viverette
5f1e58eafa am 5cabee8e: Make switchStyle public 
* commit '5cabee8e3f636e471fc02d49e12d009b7fa20804':
  Make switchStyle public
 2014-04-28 20:38:11 +00:00