summaryrefslogtreecommitdiffstats
path: root/policy
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | | Fix build after bad merge resolutionMichael Kolb2014-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4af3aae1114d31847fc13d56ab03af8c7ef74577
* | | | | | | | 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
* | | | | | | | 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
| | * | | | | | | am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmergeCraig Mautner2014-03-141-12/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2': Show the keyguard if unsecure window on top
| | | * | | | | | Merge commit '3b9de0a4' into manualmergeCraig Mautner2014-03-131-12/+16
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: policy/src/com/android/internal/policy/impl/PhoneWindowManager.java Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b
| | | | * | | | | Resolved conflicts for merge of ad63d914 to jb-mr2-devCraig Mautner2014-03-131-25/+34
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b
| | | | | * | | | am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the ↵Craig Mautner2014-03-131-24/+33
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyguard if unsecure window on top * commit '20a4f490957407b9534fc453833de2fe2f276426': Show the keyguard if unsecure window on top
| | | | | | * | | am 1f52437d: Show the keyguard if unsecure window on topCraig Mautner2014-03-131-24/+33
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f52437de9aa6089a72c7c992f9e7291a6a96115': Show the keyguard if unsecure window on top
| | | | | | | * | Show the keyguard if unsecure window on topCraig Mautner2014-03-121-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When traversing windows save the fact that windows above the topmost fullscreen window do not hide the lockscreen. If there is such a window don't show it. (cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9) Fixes bug 13225149. Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
| | | * | | | | | Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-devCraig Mautner2014-03-071-24/+31
| | | |\ \ \ \ \ \
| | | | * | | | | | Show the keyguard if unsecure window on top. DO NOT MERGE.Craig Mautner2014-03-071-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When traversing windows save the fact that windows above the topmost fullscreen window do not hide the lockscreen. If there is such a window don't show it. Fixes bug 13225149. Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
* | | | | | | | | | Implement APIs for obtaining, caching themed DrawablesAlan Viverette2014-03-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Drawables are inflated during preload (or otherwise without a theme) they cache their themeable attributes in their constant state as an array keyed on attribute index. Drawables inflated with a theme will simply resolve theme attributes as part of normal inflation, and they will not cache any themeable attributes. Drawables obtained from Resources are pulled from theme-specific cache when possible. If an unthemed Drawable exists in the preload cache, a new constant state will be obtained for the Drawable and the theme will be applied by resolving the cached themeable attributes and overwriting their respective constant state properties. If no cached version exists, a new Drawable is inflated against the desired theme. Constant states from themed drawables may be cached if the applied theme is "pure" and was loaded from a style resource without any subsequent modifications. This CL does not handle applying themes to several Drawable types, but it fully supports BitmapDrawable, GradientDrawable, NinePatchDrawable, ColorDrawable, and TouchFeedbackDrawable. BUG: 12611005 Change-Id: I4e794fbb62f7a371715f4ebdf946ee5f9a5ad1c9
* | | | | | | | | | Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogsCraig Mautner2014-03-211-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
* | | | | | | | | | Added accessibility APIs for introspecting interactive windows.Svetoslav2014-03-201-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The old introspection model was allowing querying only the active window which is the one the user is touching or the focused one if no window is touched. This was limiting as auto completion drop downs were not inspectable, there was not way to know when the IME toggles, non-focusable windows were not inspectable if the user taps them as until a screen-reader starts introspecting the users finger is up, accessibility focus was limited to only one window and the user couldn't use gestures to visit the whole UI, and other things I can't remember right now. The new APIs allow getting all interactive windows, i.e. ones that a sighted user can interact with. This prevents an accessibility service from interacting with content a sighter user cannot. The list of windows can be obtained from an accessibility service or the host window from an accessibility node info. Introspecting windows obey the same rules for introspecting node, i.e. the service has to declare this capability in its manifest. When some windows change accessibility services receive a new type of event. Initially the types of windows is very limited. We provide the bounds in screen, layer, and some other properties which are enough for a client to determined the spacial and hierarchical relationship of the windows. 2. Update the documentation in AccessibilityService for newer event types. 3. LongArray was not removing elements properly. 4. Composite accessibility node ids were not properly constructed as they are composed of two ints, each taking 32 bits. However, the values for undefined were -1 so composing a 64 long from -1, -1 prevents from getting back these values when unpacking. 5. Some apps were generating inconsistent AccessibilityNodeInfo tree. Added a check that enforces such trees to be well formed on dev builds. 6. Removed an necessary code for piping the touch exploration state to the policy as it should just use the AccessibilityManager from context. 7. When view's visibility changed it was not firing an event to notify clients it disappeared/appeared. Also ViewGroup was sending accessibility events for changes if the view is included for accessibility but this is wrong as there may be a service that want all nodes, hence events from them. The accessibility manager service takes care of delivering events from not important for accessibility nodes only to services that want such. 8. Several places were asking for prefetching of sibling but not predecessor nodes which resulted in prefetching of unconnected subtrees. 9. The local AccessibilityManager implementation was relying on the backing service being ready when it is created but it can be fetched from a context before that. If that happens the local manager was in a broken state forever. Now it is more robust and starts working properly once the backing service is up. Several places were lacking locking. bug:13331285 Change-Id: Ie51166d4875d5f3def8d29d77973da4b9251f5c8
* | | | | | | | | | Add stream-level suppression to vibrate/audio services.John Spurlock2014-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add new audio restriction layer to app-ops. Restrictions add additional constraints to audio operations at a stream-level. Restrictions do not affect the persistable state, and are purely additive: that is, they can only impose additional contstraints, not enable something that has already been disabled. Restrictions also support a whitelisted set of exempt package names. - Add new audio stream-level checks to app-ops. - Implement a provisional OP_PLAY_AUDIO suppression to three java entry points MediaPlayer, AudioTrack, & SoundPool. - Enhance vibrator api to take stream information as an optional hint - the constants correspond to AudioManager stream types. OP_VIBRATE now supports the stream-level restriction check. - Simplify Vibrator subclasses by adding default implementations for two .vibrate calls. - Migrate NoMan's zen-mode control to use the new app-ops stream-level restriction mechanism. Change-Id: Ifae8952647202f728cf1c73e881452660c704678
* | | | | | | | | | Show the keyguard if unsecure window on topCraig Mautner2014-03-141-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When traversing windows save the fact that windows above the topmost fullscreen window do not hide the lockscreen. If there is such a window don't show it. (cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9) Fixes bug 13225149. Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
* | | | | | | | | | am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by ↵Jeff Brown2014-03-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | power button while screen is on" * commit '70c274361ec6089c5ed9d1a62877d51b9ec1dcc8': Hang off call by power button while screen is on
| * | | | | | | | | am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen ↵Jeff Brown2014-03-111-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | is on" * commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a': Hang off call by power button while screen is on
| | * | | | | | | Hang off call by power button while screen is onshower2014-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable power button end call and screen is off. User use power button to turn on screen will end call. Should turn on screen and not end call Change-Id: Idf34f7724dbf1796205332c5c7ef663102f8a30c Signed-off-by: shower <shower929@gmail.com>
* | | | | | | | | am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and ↵Jeff Brown2014-03-081-1/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KEYCODE_WAKEUP." into klp-modular-dev * commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d': Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
| * | | | | | | | Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.Jeff Brown2014-03-071-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new keys behave in similarly to KEYCODE_POWER but do not simply toggle between awake and asleep states. Sleep puts the device to sleep if it is awake. Wakeup wakes up the device if it is asleep. Bug: 12938999 Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
* | | | | | | | | am 2b27ef97: am c969450a: am 840c8474: Merge "Add ↵Jeff Brown2014-03-071-8/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config_supportAutoRotation." into klp-modular-dev * commit '2b27ef979dba3808cdae6dce32fe27b59197e34c': Add config_supportAutoRotation.
| * | | | | | | | Merge "Add config_supportAutoRotation." into klp-modular-devJeff Brown2014-03-071-8/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add config_supportAutoRotation.Jeff Brown2014-03-061-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some products, it may not make sense to use the accelerometer to perform auto-rotation. In that case, the product's config.xml framework resource overlay should set config_supportAutoRotation to false. Setting this to false also disables auto-rotation settings. Bug: 13211999 Change-Id: If9d7d72f2a2c576b14a4ff0afb61ea52c42c3357
* | | | | | | | | | Merge commit 'c29ab2dd' into manualmergeCraig Mautner2014-03-061-24/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of c29ab2dd to master Change-Id: I231bde04ed804097e546d6275d248310593dc3c5
| * | | | | | | | | Merge "Show the keyguard if unsecure window on top" into klp-modular-devCraig Mautner2014-03-071-24/+31
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Show the keyguard if unsecure window on topCraig Mautner2014-03-031-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When traversing windows save the fact that windows above the topmost fullscreen window do not hide the lockscreen. If there is such a window don't show it. Fixes bug 13225149. Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236