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

132347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Christopher Lane
b7cf6ff9ee am 42934c88: Merge "Fix incorrect "listener no longer active" errors" 
* commit '42934c88a0d212f73f9e894b7dcbeb777ce649bc':
  Fix incorrect "listener no longer active" errors
 2014-04-28 20:38:07 +00:00
Yohei Yukawa
2fe02f8a6e am a11b97b4: Merge "Return the cursor position in screen coordinates" 
* commit 'a11b97b4c7fea2fb1c61fa74c217db789a0f9e54':
  Return the cursor position in screen coordinates
 2014-04-28 20:38:03 +00:00
Jorim Jaggi
4e723047bc am 767c0116: Merge "Attemp to fix blank lockscreen #2." 
* commit '767c01161ad4c18bf476e224a93345a7e8a02746':
  Attemp to fix blank lockscreen #2.
 2014-04-28 20:37:59 +00:00
Jorim Jaggi
3ab060efc3 am 8ffdb68e: Merge "Flatten notification hiearchy and remove glow." 
* commit '8ffdb68e112bf1f949eec56800275beceae7fadc':
  Flatten notification hiearchy and remove glow.
 2014-04-28 20:37:55 +00:00
Alan Viverette
7d0ab11e65 am 613c0e01: Merge "Pull out dirty bounds before nulling ripples" 
* commit '613c0e010e3c0b9d327120a8cf32e1507c61aefa':
  Pull out dirty bounds before nulling ripples
 2014-04-28 20:37:40 +00:00
Selim Cinek
9cc14ad1c8 am 2f3847bf: Merge "Fixed race condition regarding first child max height" 
* commit '2f3847bf83aef4eee1b7e3b3ea16bb106accb43b':
  Fixed race condition regarding first child max height
 2014-04-28 20:37:37 +00:00
Dianne Hackborn
99a58b0e3a am c60f1877: Merge "Rework some of the voice interaction APIs." 
* commit 'c60f1877896e795a6add525ee36770e3aa77dc29':
  Rework some of the voice interaction APIs.
 2014-04-28 20:37:33 +00: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
Griff Hazen
2c6131bba9 am 293977bd: Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE. 
* commit '293977bdb028e2aa893fbeb370e20132646094a9':
  Fix the doc for Notification.FLAG_ONLY_ALERT_ONCE.
 2014-04-28 20:29:12 +00:00
Mathieu Chartier
ce4c6218a6 am c6d0dc89: am 18582a82: am 0cd623bb: Merge "Use Runtime.gc instead of System.gc for DDMS." 
* commit 'c6d0dc896438d8918f4f985513e92be9b4d69e87':
  Use Runtime.gc instead of System.gc for DDMS.
 2014-04-28 20:03:38 +00:00
Yohei Yukawa
c644ff6d4f Revise Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT 
This is a follow-up CL for I3acf2317ae1d763d11 to improve the
Javadoc for CURSOR_ANCHOR_MONITOR_MODE_CURSOR_RECT

BUG: 14323360
Change-Id: Ie8948eda3ce57da282bd82e8e9a44997f6d53245
 2014-04-29 05:01:08 +09:00
Elliott Hughes
d937f2750c am 12928a07: am 2336c4ec: Merge "Fix build." 
* commit '12928a07c5c19ac3dea6d0489506595c138b621a':
  Fix build.
 2014-04-28 19:48:24 +00:00
Elliott Hughes
12928a07c5 am 2336c4ec: Merge "Fix build." 
* commit '2336c4ecc5735eb374e5c804b1fe863650c24d7f':
  Fix build.
 2014-04-28 19:45:06 +00:00
Elliott Hughes
2336c4ecc5 Merge "Fix build." 2014-04-28 19:41:24 +00:00
Elliott Hughes
9790190fee Fix build. 
Change-Id: I0bd6e1aac19276bf664accd8d38f86d2cc7450cc
 2014-04-28 12:40:12 -07:00
Alan Viverette
5ec00ab05c Make switchStyle public 
Change-Id: I4960c4ebeb3db09b3d716330b33639c865d37490
 2014-04-28 12:39:15 -07:00