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

85708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Sams
bfd09308cf am c2f8f102: am 3f7bbe8c: Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-dev 
* commit 'c2f8f102e1b7a38adc0fc835e532a7cfbee2cf04':
  Document ColorMatrix intrinsic and add helpers
 2012-09-10 17:08:09 -07:00
Amith Yamasani
f0d067ba44 am 4cf05484: am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 
* commit '4cf0548452493cabbb7f7c09ab3ecb2ebe77ff8e':
  Resolve the correct home intent for secondary users
 2012-09-10 17:07:59 -07:00
Chris Craik
2fcf554891 am 0d11ac12: am dc531fa7: Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 
* commit '0d11ac12a238379e0a9c24a3b522035997f40d4f':
  Handle different x, y scales in drawLines AA path
 2012-09-10 17:07:55 -07:00
The Android Open Source Project
bb999845cc am 100e36f2: (-s ours) am 330a5bf8: am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '100e36f2c21ed3028a09e6635c21d4b1627b5865':
  DO NOT MERGE - Make WebView track focal points more accurately
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
 2012-09-10 17:07:51 -07:00
Raph Levien
9aa6922ba5 am 3b43678c: (-s ours) am 965e7ff4: Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev 
* commit '3b43678ca727b2a9c39662c6266d194e50c9bdc6':
  Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
 2012-09-10 17:07:34 -07:00
Christopher Tate
e6de051799 am 20779a1a: am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 
* commit '20779a1ace8322064575f03d10598650ba91181c':
  Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
 2012-09-10 17:07:28 -07:00
The Android Open Source Project
193ae1077a am 07cdbadc: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '07cdbadc17f3bc85ecda7797291ce79dd22c9792':
  Convert resized() method to new parameters.
  Don't depend on LockPatternUtils to get DevicePolicyManager
  Fix issue #7097984 java.lang.SecurityException: Permission Denial:
  Work around instability of Display.getRotation().
  GestureDetector - Mask action when checking POINTER_UP
  Turn off deadzone flash, replacing it with logcat.
  Fixed MemoryUsage issue with reporting results.
  Use focal point for scrolling in GestureDetector
  Fix keyguard layout on tablet
  Check proximity detector before powering off.
  Fix PendingIntent caching for multiuser
  Fix adb install
 2012-09-10 17:07:21 -07:00
Eric Laurent
585c19c79b am bf20314a: am 7c026320: Merge "AudioSystem: new audio device enums" into jb-mr1-dev 
* commit 'bf20314a8af8e4288b3d3ad6dc9313e0914f8955':
  AudioSystem: new audio device enums
 2012-09-10 17:07:04 -07:00
Chet Haase
be6665a933 am 39b72a7a: am 89b3f48f: Merge "Enable changing properties of layer paint" into jb-mr1-dev 
* commit '39b72a7aaef1f7a5b7e43a6d0fe5a619b303fe66':
  Enable changing properties of layer paint
 2012-09-10 17:06:53 -07:00
Christopher Tate
bb8234b85b am f1c675bc: am c0be8c85: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 
* commit 'f1c675bccd4efccb5acb982602943befa85ed660':
  Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
 2012-09-10 17:06:39 -07:00
Dianne Hackborn
3f6f96b526 am 00b7d2a0: am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev 
* commit '00b7d2a0de5d235f7eab721d4369bf93af512351':
  More multi-user stuff:
 2012-09-10 17:06:32 -07:00
Romain Guy
310558876c am f9dd3811: am 55e6b77b: Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev 
* commit 'f9dd3811a3e6712fd88d3af064bd53100b0e6d15':
  Reduce the number of locks acquired by display lists
 2012-09-10 17:06:21 -07:00
Dianne Hackborn
dd164115a0 am 15f91d91: am 417984dc: Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev 
* commit '15f91d9151aa9c2090c4c410310ddac2b0616d25':
  Wrapped call to notifyAll() in a synchronized block
 2012-09-10 17:06:13 -07:00
Adam Koch
ff9d7b770a am 173166a2: am 14c62518: am aa98d509: am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section 
* commit '173166a23080fd6ad8e7eb566fd38977bb5f6d18':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
 2012-09-10 17:06:07 -07:00
Christopher Tate
06e6fb78ec am 041aa46a: am 970683c5: Merge "Further fixup of migration to global settings" into jb-mr1-dev 
* commit '041aa46a851f9e6d4e80b98f0c9cbe2ec89faec7':
  Further fixup of migration to global settings
 2012-09-10 17:06:00 -07:00
Teng-Hui Zhu
607caa925c am f6cc1ddc: am 4db5d23d: Merge "Back key to dismiss full screen video" into jb-mr1-dev 
* commit 'f6cc1ddc35d30a7314201011353840bd0aa8935b':
  Back key to dismiss full screen video
 2012-09-10 17:05:48 -07:00
Fabrice Di Meglio
5733c2c174 am 8bcf577a: am d672d29d: Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev 
* commit '8bcf577aa095d7f1e14c33ac5e6cf39f904bdfdd':
  Update documentation for layout direction qualifiers for Resouces
 2012-09-10 17:05:42 -07:00