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

126602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabriel Peal
f285367359 am f53d1a01: Merge "resolved conflicts for merge of c1edfc2c to master" 
* commit 'f53d1a01972d04402b48476d6a8173285516edd3':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.
 2014-03-25 23:00:55 +00:00
Zhijun He
725f9e13d6 am aaad0047: Merge "Camera2: Add partial flash state" 
* commit 'aaad0047a6c2e7478312b85ebab275a3578ec4c2':
  Camera2: Add partial flash state
 2014-03-25 23:00:51 +00:00
Adam Lesinski
7f920c2245 am 7f3b7116: Merge "Shared library resource support" 
* commit '7f3b7116b78ca108f64ca2f5d57515793ef9fd02':
  Shared library resource support
 2014-03-25 23:00:48 +00:00
Gabriel Peal
70054d15df am db0dca82: resolved conflicts for merge of c1edfc2c to master 
* commit 'db0dca826d992af1adfa53e10c31f08d3197bb0b':
  resolved conflicts for merge of c1edfc2c to master
 2014-03-25 23:00:43 +00:00
Gabriel Peal
d5bb948acf am 5e44cadf: Merge "resolved conflicts for merge of c1edfc2c to master" 
* commit '5e44cadfd69c210c11f80cfe599718617a0e6676':
  resolved conflicts for merge of c1edfc2c to master
 2014-03-25 23:00:40 +00:00
Baligh Uddin
66963a8ce3 am 05f79758: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '05f79758cd2688f89444a38baba326a0a1c1a438':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:37 +00:00
Baligh Uddin
50998a8cf1 am 449616f9: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '449616f9aeff15db215e57e688a3190421e29e55':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:34 +00:00
Baligh Uddin
6698b23350 am da94c0ef: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'da94c0efe923db612ca5c743ccca5c33bb742dbf':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:31 +00:00
Baligh Uddin
bbcc25b932 am 20de38b9: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '20de38b9ab7f4931f88c1bc8931d622dfbab7a88':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:28 +00:00
Baligh Uddin
9a89f09a05 am 52528c5e: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '52528c5ef0ad6407ed360146a4986e7894b75a3d':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:25 +00:00
Baligh Uddin
2f484d0be4 am d894e15c: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'd894e15c135575698816a6def7c2c384bd49dae7':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:22 +00:00
Baligh Uddin
1b04107739 am fca9992c: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'fca9992c4bef92da76a37399d463e3cb3ab69139':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:19 +00:00
Baligh Uddin
c065458cf6 am 71d718b7: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '71d718b749554c9c0658082c8d650a02c845fec3':
  Import translations. DO NOT MERGE
 2014-03-25 23:00:16 +00:00
Gabriel Peal
c7d15903fa am 2d72d000: Merge "resolved conflicts for merge of 74fb97de to master" 
* commit '2d72d000939acc10ba0f5000689ad86483b7c19e':
  resolved conflicts for merge of 74fb97de to master
 2014-03-25 23:00:13 +00:00
Chris Craik
0d92b2adb7 am c21929c7: Merge "Fix doc build" 
* commit 'c21929c710949a48790fa2701c47cedfabb7b9dc':
  Fix doc build
 2014-03-25 23:00:11 +00:00
Jean-Michel Trivi
fe2120ab0a am cd60e3a5: Merge "Begin refactor of MediaFocusControl" 
* commit 'cd60e3a57cfdc3d00083287c6589a2c7a7d7b104':
  Begin refactor of MediaFocusControl
 2014-03-25 23:00:08 +00:00
John Reck
71e319c686 am bcad68ad: Merge "Move where updateProperties is called" 
* commit 'bcad68ad80e5a44e5dc6988eddb8acabdc01a737':
  Move where updateProperties is called
 2014-03-25 23:00:04 +00:00
John Reck
e1a3909d17 am 632717e6: Merge "Add missing null check" 
* commit '632717e60990b900e6d20dddd3935a57dd6a8fa6':
  Add missing null check
 2014-03-25 23:00:01 +00:00
Tim Kilbourn
ae316d9170 am 803d91b2: Fix NPE when inflating GradientDrawables. 
* commit '803d91b2b2eef42e1ebe088613f83e555d2bfd04':
  Fix NPE when inflating GradientDrawables.
 2014-03-25 22:59:59 +00:00
Przemyslaw Szczepaniak
abec76e5d6 am 0a8596dc: Merge "Documentation update for TextToSpeech#getFeatures" 
* commit '0a8596dc0c497404a332ae990b2bd77553cde870':
  Documentation update for TextToSpeech#getFeatures
 2014-03-25 22:59:56 +00:00
Yohann Roussel
85b043f6ef am 30494b70: Merge "Add one test application for multidex." 
* commit '30494b70e96a45f91231586b5b5be45a4f6dea1a':
  Add one test application for multidex.
 2014-03-25 22:59:52 +00:00
Alan Viverette
cf7b3fff96 am eebf17ad: Merge "Unhide touch feedback drawable and wrapper" 
* commit 'eebf17ad202f712173840e25da356c5bef870ff8':
  Unhide touch feedback drawable and wrapper
 2014-03-25 22:59:49 +00:00
Michael Wright
67731b6852 am 5da8ca91: Merge "Respect ACTION_CANCEL for joystick fallbacks" 
* commit '5da8ca918967b7100b8f7927c08075e4555347ab':
  Respect ACTION_CANCEL for joystick fallbacks
 2014-03-25 22:59:46 +00:00
Alan Viverette
31ec833410 am 9bbbee11: Merge "Implement APIs for obtaining, caching themed Drawables" 
* commit '9bbbee116e5d480c56676686b96e86e2ef7d83ca':
  Implement APIs for obtaining, caching themed Drawables
 2014-03-25 22:59:42 +00:00
Chong Zhang
aa29fd6988 am 29e4cf0a: am 2ac81ee6: (-s ours) am c4e6233b: am b68d38e8: DO NOT MERGE change Surface constructor arg to 64bit 
* commit '29e4cf0a1a0ece43d524b4dfa340ab98da6e19f5':
  DO NOT MERGE change Surface constructor arg to 64bit
 2014-03-25 22:59:39 +00:00
Winson Chung
2246b7412c am c9b0d582: Merge "Fixing issue where we were relaunching each activity from recents instead of bringing them to the front." 
* commit 'c9b0d582071c7b4fb2538b86e2e0c4c2f914b664':
  Fixing issue where we were relaunching each activity from recents instead of bringing them to the front.
 2014-03-25 22:59:36 +00:00
Ruben Brunk
7a4192e0d0 am 0dfdcb10: Merge "camera3: Update whiteLevel/greenSplit docs." 
* commit '0dfdcb10195c8b0f4e5ffbc662067363a4f7f3d9':
  camera3: Update whiteLevel/greenSplit docs.
 2014-03-25 22:59:32 +00:00
Winson Chung
bcb3880315 am 75c549c5: Merge "Moving task view layout into resource." 
* commit '75c549c537cf44d1f1bb13422a950637f7f5c489':
  Moving task view layout into resource.
 2014-03-25 22:59:29 +00:00
John Spurlock
df50dec238 am 66c49bc9: am c3b7a671: (-s ours) am e2cae0a6: am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev 
* commit '66c49bc99d3e33c00c3f674fca9cba06d1abc199':
  Unhide Notification kind, rename to category.
 2014-03-25 22:59:27 +00:00
John Reck
d49f46d21b am 78ce1c52: Add back clobbered cleanup 
* commit '78ce1c5247de60a4247d81d168fd9fa97c7591d0':
  Add back clobbered cleanup
 2014-03-25 22:59:23 +00:00
Jose Lima
89edcbce4f am 41c2d2ce: Merge "resolved conflicts for merge of 6c45157c to master" 
* commit '41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe':
  Added isGame application tag to the manifest
 2014-03-25 22:59:20 +00:00
John Reck
39967a60ee am 2ddf5166: Merge "Add stagingProperties" 
* commit '2ddf5166ea1da32f7ac63392f369f8a3c36a16df':
  Add stagingProperties
 2014-03-25 22:59:17 +00:00
Ricardo Cervera
fd8e0a3572 am ae5d7d5d: docs: Added new sensor types. Bug: 10674725 
* commit 'ae5d7d5d61def1c7af9d69d3e72a0f5f4a8a6414':
  docs: Added new sensor types. Bug: 10674725
 2014-03-25 22:59:14 +00:00
Dianne Hackborn
096ed282c7 am 852472d9: Fix build. 
* commit '852472d9aa39eb4591eac43487ac3e0944e1daf6':
  Fix build.
 2014-03-25 22:59:11 +00:00
Mark Renouf
331ddaa26e am de02cdc1: am 7390d4ab: am 3796594c: am a63cd9f4: Merge "Run finalizers before counting for StrictMode." into klp-modular-dev 
* commit 'de02cdc1e95cea19b2ddef26d60ad1d109bd507c':
  Run finalizers before counting for StrictMode.
 2014-03-25 22:59:08 +00:00
Craig Mautner
575d4cf614 am 452fd493: am 5332706b: am b98ee1eb: am 103ed355: am 557a93e1: Merge "Set ScreenshotSurface secure if any secure content is shown." 
* commit '452fd49369da80a460d43fcb7e71d8549268f378':
  Set ScreenshotSurface secure if any secure content is shown.
 2014-03-25 22:59:05 +00:00
Jinsuk Kim
7beb711c73 am 1c855178: am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev 
* commit '1c855178e497f7ba788dadb87167f1e6735d10cb':
  Add HdmiCecManager
 2014-03-25 22:59:02 +00:00
Chris Craik
973240fef5 am 76c30ce3: Merge "Rework Outline API, remove isolatedZVolume remnants" 
* commit '76c30ce3c1d8f1a818502aaea2c42c84d6bd3f92':
  Rework Outline API, remove isolatedZVolume remnants
 2014-03-25 22:58:59 +00:00
Craig Mautner
50294d2826 am f114a5c4: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" 
* commit 'f114a5c4d123af574dbae89befc3be61a01d1382':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 22:58:56 +00:00
Dianne Hackborn
99cf34796a am 43111e89: Merge "Battery stats: wake locks, radio active, cleanup." 
* commit '43111e897be9f79ababb0ecf99f155695416d956':
  Battery stats: wake locks, radio active, cleanup.
 2014-03-25 22:58:53 +00:00
Will Haldean Brown
3bd262b7c1 am 48a5dbd3: Update current.txt for offset attributes. 
* commit '48a5dbd3cc5dd8a919983455757dc4c7b82500ab':
  Update current.txt for offset attributes.
 2014-03-25 22:58:49 +00:00
quddusc
ae301258a2 am 370cd467: am 87eac093: am 5771d425: am 5b2e92e3: am 529d47ac: am e9863dbe: Merge "docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page." into klp-docs 
* commit '370cd4677b8ee6c8b97291b02fb0c28fd275965e':
  docs: Added feature highlights and related resources for Jarlsberg to Google Play services landing page.
 2014-03-25 22:58:45 +00:00
quddusc
1b7333a3af am 0d828311: am ce6307d3: am 3ee70ca4: am 9c1eaeb0: am ff2599f9: am 0802b4fb: Merge "docs: Added Javadoc for Gcore Jarlsberg release." into klp-docs 
* commit '0d828311ba0bc40245bc5a20a15258d8621f0245':
  docs: Added Javadoc for Gcore Jarlsberg release.
 2014-03-25 22:58:40 +00:00
Selim Cinek
0878443b2c am 4c01eccb: am 38fc02d4: am d9e5761a: am 04ea3ca0: am 50ac19e9: am ba126c09: Disable Set Wallpaper button while loading image 
* commit '4c01eccb0c06fb83532cad00cbf9a4b47b6dc1f8':
  Disable Set Wallpaper button while loading image
 2014-03-25 22:58:37 +00:00
Chad Brubaker
507ecb3cab am 87f738d2: am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev 
* commit '87f738d2787444854cd15695b599b84b25027167':
  Fix support for simultaneous VPN tuns
 2014-03-25 22:58:33 +00:00
Chad Brubaker
d0acdb5f24 am ff3bb2fe: am 7f623d6b: am 9506e84b: am c7726147: am 1fce89d9: am de4e7b49: Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev 
* commit 'ff3bb2fe95a7d0158f5a456368eb7fa91069bc23':
  Include the interface for clearDnsInterfaceForUidRange
 2014-03-25 22:58:30 +00:00
Ricardo Cervera
fe9ee2b530 am b7fe3363: am 1575e1a1: (-s ours) am 419b17ec: am 1d77a874: am 588300cb: am 2e929658: Merge "docs: Added new sensor types. Bug: 10674725" into klp-docs 
* commit 'b7fe33633b49924c35751d4e5796f8add4ad623c':
  docs: Added new sensor types. Bug: 10674725
 2014-03-25 22:58:26 +00:00
Chris Wren
0f1bf07453 am 8ed3b587: Merge "add more dump info for heads up notifications" 
* commit '8ed3b587f00ccb1b4264d2ee3590af32464428c9':
  add more dump info for heads up notifications
 2014-03-25 22:58:22 +00:00
John Reck
d0e0e35f7d am 1e1f4d70: am 02e99e27: am ae316643: am aff40e25: am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev 
* commit '1e1f4d705edaad3700b49c730bc8a22c522cb46b':
  Eliminate mHasAlpha
 2014-03-25 22:58:19 +00:00
Dianne Hackborn
3020d98011 am 48600b95: Merge "Fix issue #13564072: Back button no longer dismisses IME after voice usage" 
* commit '48600b95cad8d49772ca5634a317b893d2346f42':
  Fix issue #13564072: Back button no longer dismisses IME after voice usage
 2014-03-25 22:58:16 +00:00