summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Collapse)AuthorAgeFilesLines
* am 26c6a50f: Rename isScreenOn() to isInteractive().Jeff Brown2014-04-111-3/+3
|\ | | | | | | | | * commit '26c6a50f037c6af9c41b3f96269fe194748605ce': Rename isScreenOn() to isInteractive().
| * Rename isScreenOn() to isInteractive().Jeff Brown2014-04-111-3/+3
| | | | | | | | | | | | Fix build break due to an earlier merge. Change-Id: I6e6583b251da9e027a4ade45cb4bb77e9d4ee624
* | resolved conflicts for merge of 4e5c089e to master-lockscreen-devJeff Brown2014-04-111-27/+18
|\ \ | |/ | | | | Change-Id: I456ff6be1e39b65f3e0efeb7fb1924e71d11f6b1
| * resolved conflicts for merge of 337e764d to masterJeff Brown2014-04-111-27/+18
| |\ | | | | | | | | | Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
| | * am f24687e2: Merge "Plumb display power state through display manager." into ↵Jeff Brown2014-04-111-28/+19
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev * commit 'f24687e2731811fd0e3803b691fd47a659f89329': Plumb display power state through display manager.
| | | * Plumb display power state through display manager.Jeff Brown2014-04-101-28/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare a new method, Display.getState() to retrieve the actual power state of a display. Improved documentation for Intent.ACTION_SCREEN_ON and Intent.ACTION_SCREEN_OFF to clarify what they really mean in terms of the interactive state of the device. Deprecated PowerManager.isScreenOn() and replaced it with PowerManager.isInteractive() with a more suggestive name and better documentation. Redirect display power state changes to go through the display manager first and only then head over to the power manager for legacy compatibility. Eliminated the bright here and woke here policy flags since they were unused. Simplified the input dispatch policy somewhat. Ensure that screen wake locks are respected up until the point when dozing really begins. Fixed a regression in DreamService where onDreamingStarted might be called before onWindowAttached. Bug: 13133142 Bug: 13472578 Bug: 13929355 Bug: 13760290 Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
* | | | Protect WindowManager's PRIVATE_FLAG_KEYGUARDAdrian Roos2014-04-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enforce that only status bar can use the new keyguard flag. Bug: 13635952 Change-Id: I807ffbb1e431fa187f22d030331374eb61dedcf3
* | | | Make FLAG_SHOW_ON_LOCKSCREEN work again.Jorim Jaggi2014-04-091-1/+0
| | | | | | | | | | | | | | | | | | | | Bug: 13635952 Change-Id: I50c5184c41e10e90e6547d810b2be9eed103e074
* | | | Force status bar showing when Keyguard is showing.Jorim Jaggi2014-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | Bug: 13635952 Change-Id: I5015f17010c853f70f5622b774b2c5b4e1d8332f
* | | | am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions."George Mount2014-04-071-4/+56
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6fd0ef7f7367ce6e2272e9c517793d502fe7f8da': Add Transitions useful for Activity transitions.
| * | | Add Transitions useful for Activity transitions.George Mount2014-04-071-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slide: transition in and out of the edge of the scene. Explode: transition to the scene borders Moved capability from Fade to Visibility. Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
* | | | am dde10d07: Merge "Implement "Back" for Activity Transitions."George Mount2014-04-071-96/+324
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'dde10d073f819e78c0b26d7f37ed10f01b45125c': Implement "Back" for Activity Transitions.
| * | | Implement "Back" for Activity Transitions.George Mount2014-04-071-96/+324
| | | | | | | | | | | | | | | | Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
* | | | am 43c290f0: Tint more icons, fix dialog styles and headersAlan Viverette2014-04-041-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '43c290f05cae0a600243d2e1ad52a07e4ca5e003': Tint more icons, fix dialog styles and headers
| * | | Tint more icons, fix dialog styles and headersAlan Viverette2014-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | BUG: 13795227 Change-Id: I4cf217748196512a5245468684246299205319f2
* | | | Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-devJorim Jaggi2014-04-021-12/+28
|\ \ \ \
| * | | | Wait for Keyguard to be drawn after boot.Jorim Jaggi2014-04-021-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old logic with waiting for the Keyguard to be drawn assumed that it is in an own window, and just checked for the visibility. This is no longer possible as the Keyguard is in the status bar, and the status bar might have been drawn without the Keyguard. So we have to wait explicitely until Keyguard told PhoneWindowManager that it has now been drawn and we can turn on the screen. In addition, the starting logic of SystemUI is moved into SystemUIApplication such the we can make sure that the status bar already exists when the callbacks from PhoneWindowManager reach KeyguardService. This simplifies the logic a lot. Bug: 13635952 Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
* | | | | am 74ee938d: resolved conflicts for merge of ffb22827 to masterCraig Mautner2014-04-011-3/+3
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '74ee938dcc5e1ab0309dd87278e26f604c756b26': Fix FLAG_DISMISS_KEYGUARD not working
| * | | | resolved conflicts for merge of ffb22827 to masterCraig Mautner2014-04-011-3/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ia01028203dfe87df91c828d681289e92b9371e3c
| | * | | am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of ↵Craig Mautner2014-04-011-5/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | 8c6e6e73 to klp-dev * commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6': Fix FLAG_DISMISS_KEYGUARD not working
| | | * | am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-devCraig Mautner2014-04-011-5/+4
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55': Fix FLAG_DISMISS_KEYGUARD not working
| | | | * \ resolved conflicts for merge of 8c6e6e73 to klp-devCraig Mautner2014-04-011-5/+4
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
| | | | | * \ am efbe7cc0: am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am ↵Craig Mautner2014-04-011-3/+3
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not working * commit 'efbe7cc0ff5c85cc7956bb3099402c7ebbe20591': Fix FLAG_DISMISS_KEYGUARD not working
| | | | | | * \ am d1c82f8f: am 1cb3c1d3: am fc80fbe3: am 7bd0b652: am 4bdab6bb: Fix ↵Craig Mautner2014-04-011-3/+3
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLAG_DISMISS_KEYGUARD not working * commit 'd1c82f8fc22216e9b544e3a3b521bcad05bc113d': Fix FLAG_DISMISS_KEYGUARD not working
| | | | | | | * \ am 4bdab6bb: Fix FLAG_DISMISS_KEYGUARD not workingCraig Mautner2014-04-011-3/+3
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4bdab6bb4c55661d4915518b1190e30c4633c6a5': Fix FLAG_DISMISS_KEYGUARD not working
| | | | | | | | * | Fix FLAG_DISMISS_KEYGUARD not workingCraig Mautner2014-04-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 13672528. Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc
* | | | | | | | | | am 4bb047fa: Fix build after bad merge resolutionMichael Kolb2014-04-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4bb047fa5e6d43a027bfe1dfe23b3541e3910a31': Fix build after bad merge resolution
| * | | | | | | | | Fix build after bad merge resolutionMichael Kolb2014-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
* | | | | | | | | | am 7fbde1e8: resolved conflict for merge of 2c73e08d to masterMichael Kolb2014-04-011-1/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | * commit '7fbde1e83703f800c98c1ef7c543f3146cfa43ef': Add outset to decor view measuring
| * | | | | | | | resolved conflict for merge of 2c73e08d to masterMichael Kolb2014-04-011-1/+13
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Iee2e1f773469db0ba26b153193945a6c246af151
| | * | | | | | | am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-devMichael Kolb2014-04-011-1/+14
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17bbd976c0971f25447b2ce66117f08029dc2fa9': Add outset to decor view measuring
| | | * | | | | | Add outset to decor view measuringMichael Kolb2014-03-311-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0e68311ff8ed1fccf9219b28c42ee43c5952050
* | | | | | | | | Reuse KeyguardViewMediator for new Keyguard implementation.Jorim Jaggi2014-03-313-69/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change reuses KeyguardViewMediator for the new Keyguard implementation in status bar. KeyguardViewManager is replaced by StatusBarKeyguardManager which handles adding the view, setting the state etc. StatusBarWindowManager is introduced to managed the window of the status bar, which has the logic of both the old Keyguard window and the old status bar window. In the current implementation, Keyguard gets displayed like it would be in the bouncer state, but that's likely to change in the future. Also, setHidden in IKeyguardService is also renamed to setOccluded, as the word hidden interferes with the terminology when dismissing the Keyguard. Bug: 13635952 Change-Id: I1c5d5a49d810d8532089f464cb2efe35e577f517
* | | | | | | | | Address comments for I059d80d8b9b9818a778ab685f4672ea2694def63Jorim Jaggi2014-03-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13635952 Change-Id: I5d2bd44b3588621f26d94baab161e4e2444197a8
* | | | | | | | | Merge "Make Keyguard a library and make StatusBar the new Keyguard." into ↵Jorim Jaggi2014-03-313-104/+129
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | master-lockscreen-dev
| * | | | | | | | Make Keyguard a library and make StatusBar the new Keyguard.Jorim Jaggi2014-03-283-104/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change achieves a couple of things: - Let Keyguard be a library, so we can use it in SystemUI. - Introduce FLAG_KEYGUARD for windows and deprecate TYPE_KEYGUARD. Make all the TYPE_KEYGUARD behaviour dependant on the flag. - Implement a new KeyguardService in SystemUI, and bind that service from PhoneWindowManager. - Introduce BaseStatusBar.setKeyguardState and inflate KeyguardSimpleHostView there and use FLAG_KEYGUARD for the window, such that the status bar window essentially gets the Keyguard. Bug: 13635952 Change-Id: I059d80d8b9b9818a778ab685f4672ea2694def63
* | | | | | | | | am 80b4e098: am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane ↵Wink Saville2014-03-301-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Mode on/off issue" * commit '80b4e09849048a78e08911eff9907cae618eba35': GlobalActions: Fix Airplane Mode on/off issue
| * | | | | | | am 44b43a51: am 1e4cad81: Merge "GlobalActions: Fix Airplane Mode on/off issue"Wink Saville2014-03-301-3/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '44b43a51c7d7e5c2cbe1d9912ee4a21686fa1a58': GlobalActions: Fix Airplane Mode on/off issue
| | * | | | | | | GlobalActions: Fix Airplane Mode on/off issuenagarw2014-03-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: Unable to turn off Airplane mode from power button after phone reboot Fix: Initialize mHasTelephony before the PhoneStateListener is registered to the TelephonyManager so that correct value of mHasTelephony is reflected when onServiceStateChanged callback is called. Bug: 13697360 Change-Id: Ide8afd9c16ea90b98b5912dbff440c5fd67b178d
| * | | | | | | | am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am ↵Craig Mautner2014-03-251-5/+9
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit 'd09550687360544f0659e37f393ba2f5b04b55a4': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
| | * | | | | | | am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am ↵Craig Mautner2014-03-251-5/+9
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit '74e19f572a598ce907661ed2f5127319f8d7c635': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
| | | * | | | | | am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am ↵Craig Mautner2014-03-251-5/+9
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit '550b44d1884c5f65187dbc8bf8d4e6090f302a7b': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
| | | | * | | | | am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am ↵Craig Mautner2014-03-251-5/+9
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit '02c7ba73e8733def289535b6d13dc6a504a0443f': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
| | | | | * | | | am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge ↵Craig Mautner2014-03-251-5/+9
| | | | | |\ \ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev * commit '41bb0637ca430808ab40a0300467ea58ae0a05c3': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
| | | | | | * | | am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into ↵Craig Mautner2014-03-251-5/+9
| | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '86f9a93e20bf33b9f5152592f4781bd253be8643': Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
| | | | | | | * | Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogsCraig Mautner2014-03-221-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous fix to keep non-show-when-locked windows hid dialogs from activities that had asked to be show-when-locked. That was too restrictive. Fixes bug 13225149. Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4
| | | | | * | | | am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT ↵Adrian Roos2014-03-181-11/+12
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE - Fix keyguard pattern lockout bug * commit '500ec9ce4b7856eca480c4c7dca8df1211614102': DO NOT MERGE - Fix keyguard pattern lockout bug
| | | | | | * | | am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bugAdrian Roos2014-03-181-11/+12
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecba937b005b07d72eadfaf93a200e0b14af2980': DO NOT MERGE - Fix keyguard pattern lockout bug
| | | | | | | * | DO NOT MERGE - Fix keyguard pattern lockout bugAdrian Roos2014-03-181-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 91c9561cbe665f91e1665f30362c409ae180b127) Bug: 13302967 Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28
| * | | | | | | | am f6f0946a: am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into ↵Craig Mautner2014-03-141-12/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manualmerge * commit 'f6f0946addc5230634ac2a09115097531dc6094b': Show the keyguard if unsecure window on top