summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Collapse)AuthorAgeFilesLines
* am 50a0e305: am 8c63f98b: Merge "Allow home to be pressed while in incoming ↵Yorke Lee2014-10-141-9/+0
|\ | | | | | | | | | | | | call screen" into lmp-mr1-dev * commit '50a0e30525b1d67b5e9a9cb686ffb4d2dd729672': Allow home to be pressed while in incoming call screen
| * Allow home to be pressed while in incoming call screenYorke Lee2014-10-101-9/+0
| | | | | | | | | | Bug: 10692603 Change-Id: I2c213d553013bdd906f0ce54eba90a57bd7ae34c
* | am a53995be: am d853a900: am 1840bfee: Merge "Make GlobalKeyManager ↵Justin Koh2014-10-101-0/+1
|\ \ | |/ | | | | | | | | | | broadcasts send as foreground" into lmp-sprout-dev * commit 'a53995be1d6f91c3415ed59f839275d81c73d2b4': Make GlobalKeyManager broadcasts send as foreground
| * Merge "Make GlobalKeyManager broadcasts send as foreground" into lmp-sprout-devJustin Koh2014-10-091-0/+1
| |\
| | * Make GlobalKeyManager broadcasts send as foregroundJustin Koh2014-10-091-0/+1
| | | | | | | | | | | | | | | | | | Should prioritize these since they are due to user interaction. Change-Id: If36d5502dbd53de6102b05fd54caed56e22685da
* | | am 57af6ac7: am d190a5ca: am 0e259ce2: am 6166a824: Merge "Implement issue ↵Dianne Hackborn2014-10-101-2/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | #17906468: Allow search request to fall back to global search" into lmp-dev * commit '57af6ac767ff7063adbff694ff784e9ddc442a7e': Implement issue #17906468: Allow search request to fall back to global search
| * | Implement issue #17906468: Allow search request to fall back to global searchDianne Hackborn2014-10-091-2/+12
| |/ | | | | | | Change-Id: I04834b2a9f1ec4a68c6a3fed14da2f8dd93b3be7
* | am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real ↵Dianne Hackborn2014-10-101-1/+1
|\ \ | |/ | | | | | | | | | | "code" (aka marketing) name." into lmp-dev * commit '36ae48a850bade17d485cb49dd40a3f11f667ad4': Put in real "code" (aka marketing) name.
| * Merge "Put in real "code" (aka marketing) name." into lmp-devDianne Hackborn2014-10-081-1/+1
| |\
| | * Put in real "code" (aka marketing) name.Dianne Hackborn2014-10-071-1/+1
| | | | | | | | | | | | Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
* | | am afcd4961: am 71747669: am 662034f1: am 7f76ff2c: Merge "Suppress ↵Jeff Brown2014-10-081-1/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | redundant power key presses while turning screen on." into lmp-dev * commit 'afcd49611e8adcbd159ccf480963d143c10f36ba': Suppress redundant power key presses while turning screen on.
| * | Suppress redundant power key presses while turning screen on.Jeff Brown2014-10-071-1/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it can take a long time to turn the screen on. That's not good but what's worse is that the user will often get impatient and press the power button again which effectively cancels the process and makes the screen not come on at all. The user may then conclude that the device ignored the power key press. This change suppresses power key presses while we're already in the process of turning the screen on so that at least the screen comes on eventually, even if it's slower than we would like. Bug: 17753363 Change-Id: I23083873e35a3dcfa5c20b6f870f53c18e465582
* | am fbeaa769: am 9098184b: am 35eb8909: am ba5df0d0: Merge "Prevent monkey ↵Guang Zhu2014-10-031-0/+6
|\ \ | |/ | | | | | | | | | | from triggering bugreport" into lmp-dev * commit 'fbeaa769cea6a7c3ef0a7439847dc2b62d235c59': Prevent monkey from triggering bugreport
| * Prevent monkey from triggering bugreportGuang Zhu2014-10-031-0/+6
| | | | | | | | Change-Id: Ifa6f06f7dfa63b740352ad7388f33911649afcb0
* | resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aospNeil Fuller2014-10-021-4/+3
|\ \ | | | | | | | | | Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
| * | Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation is an API change: FloatMath is going to be deprecated and/or removed. Performance is not the goal of this change. That said... Math is faster than FloatMath with AOT compilation. While making the change, occurances of: {Float}Math.sqrt(x * x + y * y) and {Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2)) have been replaced with: {(float)} Math.hypot(x, y) Right now there is no runtime intrinsic for hypot so is not faster in all cases for AOT compilation: Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with AOT, but all other combinations of FloatMath, use of pow() etc. are slower than hypot(). hypot() has the advantage of being self documenting and could be optimized in future. None of the behavior differences around NaN and rounding appear to be important for the cases looked at: they all assume results and arguments are in range and usually the results are cast to float. Different implementations measured on hammerhead / L: AOT compiled: [FloatMath.hypot(x, y)] benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials [FloatMath.sqrt(x*x + y*y)] benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials [FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))] benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials [(float) Math.hypot(x, y)] benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials [(float) Math.sqrt(x*x + y*y)] benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials [(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))] benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials Interpreter: benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I06c91f682095e627cb547d60d936ef87941be692
* | | am ac40e790: am ced21e4e: am c754382b: am fe426d06: Merge "Inset the ↵Adam Powell2014-10-011-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | non-overlay contextual action bar without a status guard" into lmp-dev * commit 'ac40e79029b99ef46f68c510ef19e81363f25bab': Inset the non-overlay contextual action bar without a status guard
| * | Inset the non-overlay contextual action bar without a status guardAdam Powell2014-09-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the status guard is not available, (e.g. when the window is not drawing system bars) do not consume the insets when an action mode is active. Bug 17691453 Change-Id: I459622eaf161a96152fb9ac5f60bb9508aa4de89
* | | am e825d695: am 3a85b618: am 065b605c: am 55ecb483: Merge "Don\'t forward ↵RoboErik2014-09-261-12/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | media keys to the app if the phone session is active" into lmp-dev * commit 'e825d6958821a4d63c2e7db39c1c02b4300dd1c8': Don't forward media keys to the app if the phone session is active
| * | Don't forward media keys to the app if the phone session is activeRoboErik2014-09-261-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This checks if the phone app is currently getting or in a call when a media key event is sent and sends it to the phone session instead of the foreground app if it is. bug:17527302 Change-Id: Ie5d6cf0c897da81d106f2b1a0561b79f4fc35e82
* | | am d1cc88aa: am fa3b777d: am 8d1b0035: am 7b7ef437: Merge "Don\'t start the ↵Dan Sandler2014-09-262-2/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | keyguard until boot is done." into lmp-dev * commit 'd1cc88aa0bc9f123250aae95d4559cc1c4683f41': Don't start the keyguard until boot is done.
| * | Merge "Don't start the keyguard until boot is done." into lmp-devDan Sandler2014-09-262-2/+5
| |\ \
| | * | Don't start the keyguard until boot is done.Jason Monk2014-09-262-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the KeyguardServiceDelegate but don't bind until boot is done. Until the keyguard is bound, the delegate will assume it should be in a secure state. Bug: 17464800 Change-Id: I91650d1e3e3ea993168855bc3444b905aac9aac3
* | | | am e4deffcd: am 0dc10d6d: am b0ce3099: am ff0384fa: Merge "Turn the device ↵Michael Wright2014-09-261-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | on if the camera lens is uncovered." into lmp-dev * commit 'e4deffcd00e895a2fd0b853d8920e4d0ea87181d': Turn the device on if the camera lens is uncovered.
| * | | Merge "Turn the device on if the camera lens is uncovered." into lmp-devMichael Wright2014-09-261-0/+1
| |\ \ \
| | * | | Turn the device on if the camera lens is uncovered.Michael Wright2014-09-251-0/+1
| | |/ / | | | | | | | | | | | | Bug: 17643810 Change-Id: I4747414224c3219bf91c0c83e969530cb20f96e5
* | | | am 889422bb: am df6e14c8: am c1b3b21e: am 00660f66: Merge "Fix "Always apply ↵Alan Viverette2014-09-261-21/+39
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | window insets to action modes"" into lmp-dev * commit '889422bba8f5f19c12479de8802cccc178bc0eb0': Fix "Always apply window insets to action modes"
| * | | Merge "Fix "Always apply window insets to action modes"" into lmp-devAlan Viverette2014-09-251-21/+39
| |\ \ \ | | |/ / | |/| |
| | * | Fix "Always apply window insets to action modes"Alan Viverette2014-09-241-21/+39
| | | | | | | | | | | | | | | | | | | | BUG: 17628875 Change-Id: I03bf6cfd68d0ca2904b43e00f68d07d497ff9879
* | | | am 5a662bca: am b667c05d: am e4465aea: am f40f4af6: Merge "Add announcement ↵Jason Monk2014-09-241-0/+41
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | of global actions dialog" into lmp-dev * commit '5a662bcac6c47dbea80b3cbef350d7dc6b922d11': Add announcement of global actions dialog
| * | | Merge "Add announcement of global actions dialog" into lmp-devJason Monk2014-09-241-0/+41
| |\ \ \ | | |/ / | |/| |
| | * | Add announcement of global actions dialogJason Monk2014-09-241-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than saying 'Alert', say 'Alert, ...' describing the contents of the menu. Bug: 17559783 Change-Id: I43b1b5ba9ce76b8c205f2d29f2f8ee7569517c19
* | | | am 87c18cc6: am 2d8fd798: am c91bd121: am 3f51958b: Merge "Fix window ↵Jeff Brown2014-09-231-100/+128
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | manager policy state when waking from doze." into lmp-dev * commit '87c18cc6d01fa553bc72e7d2b66f15f58863113a': Fix window manager policy state when waking from doze.
| * | | Fix window manager policy state when waking from doze.Jeff Brown2014-09-231-100/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once upon a time when the world was fresh and new, the heavens had an easy rhythm. Day and night. Night and day. In the day, the pixel fairies would cavort and play in the bright gardens with narry a mark of shadow or gloom. In the night, they would rest peacefully, dreaming no dreams and knowing no fear. Then one night a fairy dreamed the first dream. At first the dream was peaceful, full of colors and delight, hopes and memories. Then all at once, jarringly, it awoke in bright daylight. The pixel fairy knew fear, for the world had changed and it was unprepared. Time passed and the pixel fairies grew accustomed to their fate, day and night, night and day, sometimes dreaming, until there came a night when a fairy did not sleep. It roamed the land in a dreamless doze, lost and afraid amid a grim haze of grey and darkness. The fairy despaired. It wanted no part of this place. It pretended for a time to be awake but the bright daylight would not come. It pretended for a time to be dreaming but the colors and memories would not come. That is when the fairy wished for oblivion. Then just as suddenly, it awoke in the daylight. It fell to the ground, stunned as if it had forgotten how to walk in the too bright daylight. Though the world again grew softer and kinder in time, the pixel fairies were never the same. For the night is dark and full of terrors. --- It used to be easy. Screen on and screen off could explain almost everything about the state of the device but it's different now with ambient display. We need to be able to wait for all windows to be drawn even in the case where the device is still nominally asleep. In truth, the window manager policy which drives a lot of these interactions is a thicket of outdated assumptions. Added a new method to tell the window manager policy when the screen is being turned off so that it can correctly account for changes to the interactive state (wakeUp and goingToSleep) and screen state (screenTurningOn and screenTurnedOff). Now we can independently poke keyguard during interactive state changes and we can apply screen on blocking during screen state changes. Moved the code which manages screen on blocking (which is what ensures the UI has fully drawn before revealing screen contents) from the power manager to the display manager since the display manager is in a better position to accurately track the state of the screen, particularly when the screen is being turned off. Fixed a bunch of synchronization issues. Previously some work had been moved to a handler without considering what might happen if it became reordered relative to other work happening elsewhere. Documented the desired behavior in the code to prevent this from happening again. There's still a bunch of stuff in here that isn't quite right, particularly the assumption that there's only one screen, but it's good enough for now. Hopefully there aren't too many bugs. Bug: 17605802 Change-Id: Ic7319e09948c8a3cda014d7e169c964a3ad86f14
* | | | am fa19b7aa: am 8434cfaf: am ae26f177: am 668e566e: Merge "Aggressively trim ↵John Reck2014-09-231-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | memory for system_process" into lmp-dev * commit 'fa19b7aa01e26d5a24e05b1bb963f9bd8d079bf7': Aggressively trim memory for system_process
| * | | Aggressively trim memory for system_processJohn Reck2014-09-221-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16978006 Don't HWUI-accelerate KeyguardScrim Aggressively trim memory as soon as a ViewRootImpl dies or has its visibility changed. Change-Id: Ie1b7c9d30653456bd2e9f309128174f972999368
* | | am 77e786ab: am 978272f4: am a94c9ccb: am 09395677: Merge "Decouple turning ↵Jeff Brown2014-09-201-57/+85
|\ \ \ | |/ / | | | | | | | | | | | | | | | screen on from waking up in policy." into lmp-dev * commit '77e786abd5f2dcb74de3cc083c1cc64c884fac9d': Decouple turning screen on from waking up in policy.
| * | Decouple turning screen on from waking up in policy.Jeff Brown2014-09-191-57/+85
| | | | | | | | | | | | | | | | | | | | | | | | This allows us to ensure windows are fully drawn before unblocking screen on while dozing. Bug: 17516245 Change-Id: Ibe63c212b8db855ce26a34a8169f33764b266ee6
* | | am 5bf6ff68: am b7e66066: am b057639f: am e58c9578: Merge "Make panel menu ↵Adam Powell2014-09-191-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | windows respect elevation" into lmp-dev * commit '5bf6ff6887d71efdfa5d099c494af3adbbd8d6d4': Make panel menu windows respect elevation
| * | Merge "Make panel menu windows respect elevation" into lmp-devAdam Powell2014-09-191-0/+7
| |\ \
| | * | Make panel menu windows respect elevationAdam Powell2014-09-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Bug 17430536 Change-Id: I962dfa10d3cb4f735dcaa68f17e7ff278d1580a2
* | | | am df7f8e24: am 4ed54216: am 89b0ec71: am d03ba30b: Merge "Always apply ↵Alan Viverette2014-09-191-19/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | window insets to action modes" into lmp-dev * commit 'df7f8e2447323e918bace1ff03349f1432d6c729': Always apply window insets to action modes
| * | | Always apply window insets to action modesAlan Viverette2014-09-181-19/+22
| |/ / | | | | | | | | | | | | BUG: 17567245 Change-Id: I3c37d228e3a9d3060a4fd1a86abf2ffbf91802e8
* | | am 2f9ae13d: am f491d835: am 73d3c81c: am fb15b0e2: Merge "Use action bar ↵Alan Viverette2014-09-181-9/+25
|\ \ \ | |/ / | | | | | | | | | | | | | | | theme for action modes, fix ViewStub inflation theme" into lmp-dev * commit '2f9ae13d5843d6f25cfaaf2db51b5a78e2a8ba33': Use action bar theme for action modes, fix ViewStub inflation theme
| * | Merge "Use action bar theme for action modes, fix ViewStub inflation theme" ↵Alan Viverette2014-09-181-9/+25
| |\ \ | | | | | | | | | | | | into lmp-dev
| | * | Use action bar theme for action modes, fix ViewStub inflation themeAlan Viverette2014-09-171-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | BUG: 17262483 BUG: 17513621 Change-Id: I74764570a11da162a224e94978e21e52d17e2e84
* | | | am c669c6c7: am ef89494b: am 1d58768d: am e182b60c: Merge "Revert "Make ↵John Reck2014-09-181-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | starting window hw-accelerated"" into lmp-dev * commit 'c669c6c77525ec5908e8eb7d223b120d2623f698': Revert "Make starting window hw-accelerated"
| * | | Merge "Revert "Make starting window hw-accelerated"" into lmp-devJohn Reck2014-09-181-0/+2
| |\ \ \
| | * | | Revert "Make starting window hw-accelerated"John Reck2014-09-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17516789 This change corresponds to a sudden influx of bad surface crashes. Reverting to see if stability returns as this was an optimization CL This reverts commit 29ff1bc57ac2c995c56f15ed6e56e5fb247b2a44. Change-Id: I7835e89017161d94ad05fe46d81bd437c3dae3a7
* | | | | am 15f36821: am cfdda0d0: am 5d294516: am a92e765e: Merge "Fix bar ↵Adrian Roos2014-09-181-22/+11
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | visibility after restarting immersive activities" into lmp-dev * commit '15f36821554d4fab2b6298703623202015967a81': Fix bar visibility after restarting immersive activities