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

85778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christopher Tate
a22f02a256 am a59441c9: am 4ea283a0: Merge "Sanity-check existence of restore agent" into jb-mr1-dev 
* commit 'a59441c9a90f9dc12a205e42404bb7516ee69be6':
  Sanity-check existence of restore agent
 2012-09-10 17:09:44 -07:00
Romain Guy
77a2f42a18 am 89dfd2e0: am be6024d5: Merge "Fix crash in ShapeDrawable" into jb-mr1-dev 
* commit '89dfd2e085be9c8b24147c5a18c9c15ac5ce9990':
  Fix crash in ShapeDrawable
 2012-09-10 17:09:40 -07:00
Jim Miller
ab6afef34f am 45ad9679: am 1ac44eb9: Merge "Don\'t hide the PIN keyboard even when a physical keyboard is present." into jb-mr1-dev 
* commit '45ad9679dbb135c232f4ea648a73f5d552102460':
  Don't hide the PIN keyboard even when a physical keyboard is present.
 2012-09-10 17:09:37 -07:00
Dianne Hackborn
234f00b9e8 am 789203ec: am 5d75052b: Merge "Add Binder.getCallingUserHandle()." into jb-mr1-dev 
* commit '789203ec530e61f7678c9883a67135bf8cd3c679':
  Add Binder.getCallingUserHandle().
 2012-09-10 17:09:33 -07:00
Jim Miller
fcfa12a9ab am 2e5e74f2: am ddb12e84: Merge "Enable lazy-loading of security views in keyguard" into jb-mr1-dev 
* commit '2e5e74f2d38cb50a43c13a7b3fdedccadbac9fc6':
  Enable lazy-loading of security views in keyguard
 2012-09-10 17:09:28 -07:00
Christopher Tate
79f1561a24 am 4cb05d3e: am 0a266965: Merge "Log all individual settings restored" into jb-mr1-dev 
* commit '4cb05d3e88f7edbd87204ca8fde3aa8185a34fc8':
  Log all individual settings restored
 2012-09-10 17:09:24 -07:00
Dianne Hackborn
452b1ce2d4 am 3374ada6: am 824b959d: Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev 
* commit '3374ada6ef0d8368b5fba38ee12c6ff9d5de8800':
  Explicitly specify current user everywhere home is started.
 2012-09-10 17:09:15 -07:00
Jeff Brown
1bfb3323c7 am 131b15a5: am 4d0b5625: Disable hardcoded wifi display adapter. 
* commit '131b15a5a6040ec5667f9a94ac7bca775b4abcfd':
  Disable hardcoded wifi display adapter.
 2012-09-10 17:09:10 -07:00
Svetoslav Ganov
fd6b02884c am c0befe6a: am 0458a69d: Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev 
* commit 'c0befe6aff6b89b8811e965d9f6ccb368900a1d3':
  Fixing off by one error in the ScreenMagnifier.
 2012-09-10 17:08:59 -07:00
Jeff Brown
4ef8108b7d am 36bae4b5: am 72018294: Merge "Make mirroring automatic based on Windows on display." into jb-mr1-dev 
* commit '36bae4b50a6f132468b1a31ad5520e70796bcfc4':
  Make mirroring automatic based on Windows on display.
 2012-09-10 17:08:37 -07:00
Jeff Brown
8eee7890c1 am 54b7362c: am 7017e483: Merge "Add support for Wifi display." into jb-mr1-dev 
* commit '54b7362cd676e34a9492eba4b463d04b454b26d8':
  Add support for Wifi display.
 2012-09-10 17:08:33 -07:00
Nick Kralevich
93e62e2e18 am 4088457d: am cd620591: Merge "installd: fix forward locking symlink" into jb-mr1-dev 
* commit '4088457d91ee4578369471e9d2ea127b799399bf':
  installd: fix forward locking symlink
 2012-09-10 17:08:30 -07:00
rich cannings
c491c1bf06 am d6870d9a: am 1275abd0: Merge "Move verification settings to Settings.Global" into jb-mr1-dev 
* commit 'd6870d9a3d9a9104ae54abfbd2876206c180b925':
  Move verification settings to Settings.Global
 2012-09-10 17:08:26 -07:00
Dianne Hackborn
e062bf6204 am ca02a46d: am cd42ce5d: Merge "Fix crash when setting wallpaper from non-primary user." into jb-mr1-dev 
* commit 'ca02a46dab9607331486d5f6c2189bae42a64592':
  Fix crash when setting wallpaper from non-primary user.
 2012-09-10 17:08:22 -07:00
Craig Mautner
258833a0d9 am 7ff30583: am df4a94e2: Merge "Fix incorrect indexing calculation." into jb-mr1-dev 
* commit '7ff30583962b0ab9e37747e4b56cb7a619fb8561':
  Fix incorrect indexing calculation.
 2012-09-10 17:08:19 -07:00
Jason Sams
8342162287 am 49801ecb: am cd664f0f: Merge "Add greyscale intrinsic test." into jb-mr1-dev 
* commit '49801ecb542531e0e83bfc4ded22a9f47f910d7c':
  Add greyscale intrinsic test.
 2012-09-10 17:08:15 -07:00