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

126776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
c65a81b11a am 7d867342: Merge "Get rid of not specifying a user errors in bluetooth." 
* commit '7d86734297bf6c2f71404498567cc92576591b8c':
  Get rid of not specifying a user errors in bluetooth.
 2014-03-25 22:58:11 +00:00
Unsuk Jung
331edf949a am 1d22bd19: am 8ae2ce76: am 7bde0fc7: am 2270ac96: am 8114c3d0: am 1a70f391: Merge "Change wallpaper sizing" into klp-dev 
* commit '1d22bd1986ced3c5396dea83d2d04f84457953ee':
  Change wallpaper sizing
 2014-03-25 22:58:07 +00:00
Will Haldean Brown
33cfad3ee6 am bdb78d82: am ede2a729: am ccd55a92: am f8c78b50: Update current.txt to include windowSwipeToDismiss 
* commit 'bdb78d8261c61e8b1c30af7ff2a39cc91026aa02':
  Update current.txt to include windowSwipeToDismiss
 2014-03-25 22:58:04 +00:00
Alex Klyubin
67b3b2cedb am f96bfe86: am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API." 
* commit 'f96bfe86a68bfd0491a76cf6dfa515dc58f027bb':
  Adjust to the change in the private SSLParameterImpl API.
 2014-03-25 22:58:00 +00:00
Jeff Sharkey
e10d842e3f am 6640f6be: am b8846c81: am cf0c4a59: am 4868da52: am c620ec36: am 3f523222: Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev 
* commit '6640f6be412e7454bfa7d457670e83aba46ea28c':
  Lock down MANAGE_DOCUMENTS permission.
 2014-03-25 22:57:57 +00:00
Will Haldean Brown
b78992516c am 02893315: am d3e33cc2: am aa0fa8eb: am cedbfad4: Fix link in documentation for SWIPE_TO_DISMISS. 
* commit '0289331500457837f8ec20eea42f7bbbc2c3f479':
  Fix link in documentation for SWIPE_TO_DISMISS.
 2014-03-25 22:57:54 +00:00
Will Haldean Brown
60e13218c2 am 125f2155: am e3d4f6c1: (-s ours) am 8f2c3252: am 496e8178: Merge "Make windowSwipeToDismiss a public attribute." into klp-modular-dev 
* commit '125f2155bedf37841d7c9a9b59fb2680e41cfcef':
  Make windowSwipeToDismiss a public attribute.
 2014-03-25 22:57:51 +00:00
Will Haldean Brown
1728d762a3 am 70d78bbe: Make windowSwipeToDismiss a public attribute. 
* commit '70d78bbeecc491ebb0a30ee650d2445145992514':
  Make windowSwipeToDismiss a public attribute.
 2014-03-25 22:57:48 +00:00
George Mount
12857efaff am fea8d956: Merge "Fix null ActivityOptions when starting an Activity in a new Process." 
* commit 'fea8d956649589f1cfd378571cc9ad61a92cd480':
  Fix null ActivityOptions when starting an Activity in a new Process.
 2014-03-25 22:57:45 +00:00
George Mount
6391e6267f am 07e1b900: Merge "Fix problem on Animator with a start delay." 
* commit '07e1b9002a51032a7dc782178d3c29d3417ab266':
  Fix problem on Animator with a start delay.
 2014-03-25 22:57:42 +00:00
Przemyslaw Szczepaniak
86907b0b20 am 7638b1f3: Merge "Do not reset language in case of the TTS service reconnect." 
* commit '7638b1f3b56d8176e401a4067b18749682635f0c':
  Do not reset language in case of the TTS service reconnect.
 2014-03-25 22:57:39 +00:00
Mathew Inwood
890818f465 am a73b0c54: Merge "Fix log spam from View.toString()." 
* commit 'a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2':
  Fix log spam from View.toString().
 2014-03-25 22:57:36 +00:00
Craig Mautner
c5dcf79800 am 296f1a91: Merge "Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."" 
* commit '296f1a9130cc5d5339ab1d1c3cfc7324920acf8a':
  Revert "Apply FLAG_SHOW_WHEN_LOCKED within tasks."
 2014-03-25 22:57:33 +00:00
Craig Mautner
580959c68d am 61ada5d3: Merge "Add Activity methods for icons and labels." 
* commit '61ada5d330e10a738ba5f085cae5b9b339895d19':
  Add Activity methods for icons and labels.
 2014-03-25 22:57:29 +00:00
John Spurlock
5b57255f71 am 9ae0c8ff: Merge "Add notification category for recommendations." 
* commit '9ae0c8ffba5ab50fb02d319a00e56fe42960cb4a':
  Add notification category for recommendations.
 2014-03-25 22:57:26 +00:00
Dianne Hackborn
c77078595a am e9c9c441: Merge "Battery stats: track actually running time" 
* commit 'e9c9c441346586e26eccc0523fcf12f5158e53f7':
  Battery stats: track actually running time
 2014-03-25 22:57:23 +00:00
Christopher Tate
808157fa16 am 18a65ad0: Merge "Cap the size of app-defined permission trees" 
* commit '18a65ad09d9a245266874015e5aacb05d868a534':
  Cap the size of app-defined permission trees
 2014-03-25 22:57:20 +00:00
Winson Chung
e6aa32dcc5 am e9c77aee: Merge "Fixing crash with multiple touch pointers" 
* commit 'e9c77aee60fbb781db916d32fe1db81e1d973f8f':
  Fixing crash with multiple touch pointers
 2014-03-25 22:57:18 +00:00
Matthew Williams
66bf0d0b4f am cde7086b: Merge "Downgrade expedited to normal on reschedule." 
* commit 'cde7086b900fd192a8e389f62ab5007d351d86b8':
  Downgrade expedited to normal on reschedule.
 2014-03-25 22:57:15 +00:00
Paul Lawrence
854037f94f am 717e0f5d: Merge "Don\'t prompt at boot if we already did that when decrypting" 
* commit '717e0f5db7161ddfff98f21fe1cdb2a3b1a6c8b7':
  Don't prompt at boot if we already did that when decrypting
 2014-03-25 22:57:11 +00:00
Jinsuk Kim
bc32dd55e3 am a7efb93c: am a10958f1: am cfba284a: am d73e66cc: Fix broken build 
* commit 'a7efb93c1b4e717049b106312ff353cd95c74f0e':
  Fix broken build
 2014-03-25 22:57:08 +00:00
Colin Cross
606d7fe211 am 8a60ded0: Merge "resolved conflicts for merge of a67e34c8 to master" 
* commit '8a60ded02614bc8358f89aa9b7cf3f8e7b1383a2':
  Add HDMI-CEC service
 2014-03-25 22:57:03 +00:00
Bo Liu
a399fe194e am caf94773: Merge "Convert a attach/detach functor in ViewRootImpl to x64" 
* commit 'caf947737d3e94d2f5d839ec1fa951df7937fdb2':
  Convert a attach/detach functor in ViewRootImpl to x64
 2014-03-25 22:56:59 +00:00
Adam Cohen
21f2fcb3f5 am fb40d78c: Merge "Catch exceptions if Exif is malformed" 
* commit 'fb40d78c57711585c9eaed467601bf3adb4f60f9':
  Catch exceptions if Exif is malformed
 2014-03-25 22:56:57 +00:00
Adam Cohen
d314a24b12 am 146af201: Merge "Catching security exception when activity destroyed" 
* commit '146af201d380cffa6a540fd0d52590bd9d30b614':
  Catching security exception when activity destroyed
 2014-03-25 22:56:54 +00:00
John Spurlock
441bdc251f am 3daafcd7: Merge "Annotate framework vibrate calls with stream hints." 
* commit '3daafcd7bab6e3ace72396576529e3049ab4c066':
  Annotate framework vibrate calls with stream hints.
 2014-03-25 22:56:51 +00:00
Selim Cinek
8b11463885 am a4c1ccf3: Merge "Disable Set Wallpaper button while loading image" 
* commit 'a4c1ccf3e045accd321be4d4c7d2ba1941a49ab4':
  Disable Set Wallpaper button while loading image
 2014-03-25 22:56:48 +00:00
Craig Mautner
a560973a33 am f7ad8557: Apply FLAG_SHOW_WHEN_LOCKED within tasks. 
* commit 'f7ad855718dc576a1618a54035b82e92356aa0d8':
  Apply FLAG_SHOW_WHEN_LOCKED within tasks.
 2014-03-25 22:56:45 +00:00
Ricardo Cervera
3cd141c59f docs: Added Android Studio build system doc. 
Added a document explaning how to use the new build system
in Android Studio.

Change-Id: I45ae1902820c1aaaf4c5810ee683b4d7a5221f16
 2014-03-25 15:49:36 -07:00
Ricardo Cervera
e535c1e587 am 8460e8ff: am 287b5bb2: am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '8460e8ffa3c697c63fb092528648351508bc7c7f':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 22:20:14 +00:00