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

85844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
bf471c9149 am 58d58fd0: am 66253895: Scaling in viewport moving state locks into a magnified state. 
* commit '58d58fd098a5de56c77b4821ab7736b5d9f6220c':
  Scaling in viewport moving state locks into a magnified state.
 2012-09-10 17:17:01 -07:00
John Reck
8627875d1c am 814b9a6c: am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev 
* commit '814b9a6cc161da3ec5c897783776faf48877d2e5':
  Fix some destroy bugs
 2012-09-10 17:16:53 -07:00
Scott Main
8243740ee7 am c9e3ba90: am 4899d6f7: am cd3ec7a2: am e9e40b43: Merge "add link to device dock lesson" into jb-dev 
* commit 'c9e3ba903c504149953e0e1c154e44b301549f85':
  add link to device dock lesson
 2012-09-10 17:16:50 -07:00
Katie McCormick
211ae7472f am 757e5600: am a25526ae: am 51740d6d: am 0e9f34bf: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '757e5600d5bc7762d65e682de13ba9fbd0476eea':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-10 17:16:45 -07:00
Svetoslav Ganov
4515755910 am fd7b8744: am e35c54eb: Merge "Allow simultaneous scale and pan in magnified state." into jb-mr1-dev 
* commit 'fd7b8744352d4c8f9cf2236f3ee0786d8685c930':
  Allow simultaneous scale and pan in magnified state.
 2012-09-10 17:16:37 -07:00
Siva Velusamy
fbd598fc10 am 5b5d482c: am bc91c5f8: Merge "Report the user id of every app to ddms." into jb-mr1-dev 
* commit '5b5d482c0c6a048c4a95b63359226ec9015012e9':
  Report the user id of every app to ddms.
 2012-09-10 17:16:33 -07:00
Dianne Hackborn
9d8d90b59d am 31c95b93: am 009ea5a0: Merge "USER_CURRENT_OR_SELF had the same int as USER_CURRENT!" into jb-mr1-dev 
* commit '31c95b93c64601994732dda6ed9de7c44f838596':
  USER_CURRENT_OR_SELF had the same int as USER_CURRENT!
 2012-09-10 17:16:25 -07:00
Dianne Hackborn
3dd94ced96 am 206aa76c: am 4573e29f: Merge "Flesh out multi-user in am commands." into jb-mr1-dev 
* commit '206aa76cdce6bc9697833f4657e7fc5de4d8f065':
  Flesh out multi-user in am commands.
 2012-09-10 17:16:20 -07:00
Victoria Lease
57ff180fe9 am 64a5c4cf: am d7f5a51b: Merge "IME support for trackball and generic motion events" into jb-mr1-dev 
* commit '64a5c4cf2f53c11b1a9141228a39ea4305b856fc':
  IME support for trackball and generic motion events
 2012-09-10 17:15:57 -07:00
Chet Haase
d1651064ab am d8f68060: am e11dc0dd: Merge "Fix clone() for Animators with just a \'to\' value" into jb-mr1-dev 
* commit 'd8f680601da495a084bacb347e1dddf1313b4cc7':
  Fix clone() for Animators with just a 'to' value
 2012-09-10 17:15:42 -07:00
Jamie Gennis
9b9b70cb5f am 515c34f2: am cae2e388: Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-dev 
* commit '515c34f22ed675933c76d286b90e2f661a283c8a':
  SurfaceTexture: add updateTexImage synchronization
 2012-09-10 17:15:34 -07:00
Andreas Huber
22bc786c71 am a639d58c: am dcc036c5: Merge "Fix port logic in WifiDisplayController." into jb-mr1-dev 
* commit 'a639d58c0d376d8c567cf387b9306d0cecff29ef':
  Fix port logic in WifiDisplayController.
 2012-09-10 17:15:07 -07:00
Svetoslav Ganov
e607dd880d am ef94c988: am 1434e29a: Merge "Check for null ViewRootImpl when saving accessibility focus in ListView." into jb-mr1-dev 
* commit 'ef94c988a2caf503a730686f3259385b0f4e4e2f':
  Check for null ViewRootImpl when saving accessibility focus in ListView.
 2012-09-10 17:14:58 -07:00
Chet Haase
90cc02da7d am d6a6c45b: am 562af68f: Merge "Reset GL buffer state after functor invocation" into jb-mr1-dev 
* commit 'd6a6c45bf34921536501f0067021e20ee6786cd0':
  Reset GL buffer state after functor invocation
 2012-09-10 17:14:46 -07:00
Baligh Uddin
6d44765eb9 am d280566e: (-s ours) am 996be340: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd280566e0fa8b5be6d4ced2c51ab36b5c67389da':
  Import translations. DO NOT MERGE
 2012-09-10 17:14:42 -07:00
John Spurlock
77b910b460 am 658c77cc: am 2323ec7e: Merge "Notifications: Hide ticker updates from background users." into jb-mr1-dev 
* commit '658c77cc32bddf096bcc8528ba186b4105ddd2e1':
  Notifications: Hide ticker updates from background users.
 2012-09-10 17:14:36 -07:00
Svetoslav Ganov
82b73148f1 am a4220030: am 7e8f6c4c: Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev 
* commit 'a422003007807f006f71c4ddbc09d06253d2a654':
  Improve scaling vs pan in screen magnifier.
 2012-09-10 17:14:32 -07:00
Amith Yamasani
757d55fd60 am 9b4d0517: am 3c1a2011: Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev 
* commit '9b4d051784a67cf5d16bc773d0a32166d568677e':
  Fix DevicePolicyManager crash when settings password quality (and possibly others).
 2012-09-10 17:14:25 -07:00
Wu-cheng Li
f87bc01766 am 774f1fca: am 753e1280: Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 
* commit '774f1fca6fff5ba9ecd5a7db9548f6644cfaff27':
  Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
 2012-09-10 17:13:37 -07:00
Irfan Sheriff
bfda102f85 am 649f27a8: am 799553e0: Merge "Fix device list update" into jb-mr1-dev 
* commit '649f27a80874d892a43b0921c4817fe51070cb7e':
  Fix device list update
 2012-09-10 17:13:32 -07:00
Wu-cheng Li
062dba02ea am d70703c1: am 41bd89f6: Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-dev 
* commit 'd70703c1351ec467c24105dda78ec03fec728037':
  Pass EXCLUDE_FROM_RECENTS when starting secure camera.
 2012-09-10 17:13:26 -07:00
Dianne Hackborn
8ff4baf8e4 am aaf7fdbf: am 01a7c79d: Merge "Various fixes." into jb-mr1-dev 
* commit 'aaf7fdbf89da3064a0ef95263a71b0a754b7e136':
  Various fixes.
 2012-09-10 17:12:48 -07:00
Jeff Brown
b4cf2d1b89 am 125fce70: am 3e6d426d: Merge "Handle case where user info might not be available." into jb-mr1-dev 
* commit '125fce70669d76fdbbf3c44c18d04c7ba3e160d1':
  Handle case where user info might not be available.
 2012-09-10 17:12:43 -07:00
Irfan Sheriff
660f192139 am e7d87ac0: am ab603ace: Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev 
* commit 'e7d87ac0c5c3f9df7373e3d7548638f36d94449b':
  Update WifiP2pWfdDevInfo from device found event
 2012-09-10 17:12:40 -07:00
Elliott Hughes
0f701bc395 am e2701ec3: am e3e53498: am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location." 
* commit 'e2701ec3ff7e707ccd96b302530de7a368316dbd':
  Fix aapt to get expat header files from the approved location.
 2012-09-10 17:12:32 -07:00
Kenny Root
edf57b6cdd am 008180c1: am be3267aa: Merge "Add a native library to test APKs" into jb-mr1-dev 
* commit '008180c1d083bcff3dee0c86891bb71a82a6460d':
  Add a native library to test APKs
 2012-09-10 17:12:19 -07:00
Kenny Root
1bfaf5dc2b am ce2a2ffc: am 785aaa2d: Merge "Add more testing for native libraries" into jb-mr1-dev 
* commit 'ce2a2ffc6775581128cefaa99100097e555ea552':
  Add more testing for native libraries
 2012-09-10 17:12:15 -07:00
Kenny Root
38a7e6798d am 7a514989: am 69d6b534: Merge "Update PackageSetting flags when updating" into jb-mr1-dev 
* commit '7a514989054c232c641eb6b1a6f786688f404f1d':
  Update PackageSetting flags when updating
 2012-09-10 17:12:10 -07:00
Guang Zhu
97bff81466 am fb997a53: am 5de4d989: Merge "Use correct PowerManager call to wake up screen" into jb-mr1-dev 
* commit 'fb997a53d0e85d0164b35df10914bdcdf77b4c89':
  Use correct PowerManager call to wake up screen
 2012-09-10 17:12:06 -07:00
Dianne Hackborn
9e0709c6fb am 1d0467ae: am 8727a731: Merge "A little cleanup." into jb-mr1-dev 
* commit '1d0467ae1d7207c9a115241e17361442bb343f0f':
  A little cleanup.
 2012-09-10 17:12:02 -07:00
Jeff Brown
f98affd217 am 43034333: am 47b2efc7: Merge "Copy all mutable state before sending to clients." into jb-mr1-dev 
* commit '43034333994e772e16074fc0690bd4f5c3841fb7':
  Copy all mutable state before sending to clients.
 2012-09-10 17:11:51 -07:00
Jeff Brown
a804691c40 am 092d330d: am fdb5bd26: Merge "Disable wifi display API when the adapter is not registered." into jb-mr1-dev 
* commit '092d330d025ebf4250024983a8b280d21d47c71f':
  Disable wifi display API when the adapter is not registered.
 2012-09-10 17:11:41 -07:00
Kenny Root
8b919cbad5 am e671ef1b: am 25c925e6: Throw ALL the exceptions! (in the PackageManagerTests) 
* commit 'e671ef1bf19033a44f16a66018d2b3f9374d039d':
  Throw ALL the exceptions! (in the PackageManagerTests)
 2012-09-10 17:11:34 -07:00
Kenny Root
d6b4f99845 am 7d06cb08: am 0c191624: Remove "protect" command from installd 
* commit '7d06cb0840f2bbf2b91a49c900ad61cae58bcf65':
  Remove "protect" command from installd
 2012-09-10 17:11:31 -07:00
Svetoslav Ganov
941e49e949 am d09cd881: am add52a97: Viewport should zoom out when screen magnification is disabled. 
* commit 'd09cd8810621b589efa33a55ce9865890ceff7d0':
  Viewport should zoom out when screen magnification is disabled.
 2012-09-10 17:11:22 -07:00
Svetoslav Ganov
09cd6d3e59 am fb9d384f: am 5b1720e1: Merge "Viewport should zoom out when screen magnification is disabled." into jb-mr1-dev 
* commit 'fb9d384f55745e711830db41f20dc2042aa5a5ac':
  Viewport should zoom out when screen magnification is disabled.
 2012-09-10 17:11:15 -07:00
Jeff Brown
251193c05a am fbb2da7a: am a3909a93: Work around crash when display is removed. 
* commit 'fbb2da7a4d3588a9deea835e4b94d1c3547735e4':
  Work around crash when display is removed.
 2012-09-10 17:10:56 -07:00
Jeff Brown
4681b76366 am 5eeb313e: am e168edb5: Merge "Add skeleton Wifi-Display tile in QS." into jb-mr1-dev 
* commit '5eeb313e7c9e72c34d5dc74ef6c19d85d3d71311':
  Add skeleton Wifi-Display tile in QS.
 2012-09-10 17:10:52 -07:00
Jeff Brown
e1424fbb55 am 1cd3b661: Merge branch \'jb-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp 
* commit '1cd3b661514321fb4cfc2b4b65cf490117a4877a':
 2012-09-10 17:10:48 -07:00
Jeff Brown
ec387bd7cc am 61dae161: Improve Wifi display discovery API. 
* commit '61dae16159f059d93e103e3dbe7c4b0bfe6aabf1':
  Improve Wifi display discovery API.
 2012-09-10 17:10:44 -07:00
Jeff Brown
496e48466f am d07934db: am 20ec8ac5: Merge "Improve Wifi display discovery API." into jb-mr1-dev 
* commit 'd07934dbc60d3f52c8133ae8249ef3d609ff2751':
  Improve Wifi display discovery API.
 2012-09-10 17:10:40 -07:00
Amith Yamasani
b69fc7b54c am 46148f22: am 8f008e73: Merge "More multi-user methods in PM" into jb-mr1-dev 
* commit '46148f22650e4e390a9488a2d31d0acd641eeffa':
  More multi-user methods in PM
 2012-09-10 17:10:32 -07:00
Jeff Brown
50098f820c am 367d2e7b: am 8e810132: Merge "Make display manager tell input system about viewports." into jb-mr1-dev 
* commit '367d2e7b74ce16cadd5d3890013acd4d1a0ac022':
  Make display manager tell input system about viewports.
 2012-09-10 17:10:29 -07:00
Winson Chung
7c5dd6271f am 7901c801: am a4a2bee7: Merge "Initial changes to add QuickSettings." into jb-mr1-dev 
* commit '7901c80164dd23094f1a110142a55fe740c2a670':
  Initial changes to add QuickSettings.
 2012-09-10 17:10:23 -07:00
Jeff Brown
b61469c513 am de758bd0: am 1edf63ef: Merge "Enable auto-brightness adjustment feature with system prop." into jb-mr1-dev 
* commit 'de758bd07df9bacb2c95ba9d00b3693b4e40b96b':
  Enable auto-brightness adjustment feature with system prop.
 2012-09-10 17:10:19 -07:00
Jeff Brown
b6e9976497 am fb7a8045: am b0d10aa9: Merge "Add new wifi display discovery API." into jb-mr1-dev 
* commit 'fb7a80459206322468144029c06e38c084b35255':
  Add new wifi display discovery API.
 2012-09-10 17:10:14 -07:00
Jeff Brown
b53f6ddb00 am 10d49dcf: am 0597100f: Merge "Retry wifi display connections." into jb-mr1-dev 
* commit '10d49dcf3d2c4b04657c038ec2dc0654fba34233':
  Retry wifi display connections.
 2012-09-10 17:10:10 -07:00
Jeff Brown
8d6a6be927 am 9fd7ce72: am f82b5836: Merge "Add permissions to control and configure wifi display." into jb-mr1-dev 
* commit '9fd7ce728b613372307b9f2ec9f22412058c16e6':
  Add permissions to control and configure wifi display.
 2012-09-10 17:10:06 -07:00
Jason Sams
4062c18eb7 am 039df49b: am 43190793: Merge "Fix doc typo." into jb-mr1-dev 
* commit '039df49b27ad3777a59bd58abc38b65ce7cc8692':
  Fix doc typo.
 2012-09-10 17:10:03 -07:00
Romain Guy
64402602b2 am ad55b0b3: am 4aacf93d: Merge "Fix memory corruption in LayerRenderer::copyLayer" into jb-mr1-dev 
* commit 'ad55b0b355ec329c7609a595a8e7a73f21dbaf87':
  Fix memory corruption in LayerRenderer::copyLayer
 2012-09-10 17:09:47 -07:00