summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-292-32/+46
|\
| * 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 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
| * | | | | | am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen ↵Jeff Brown2014-03-131-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is on" * commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a': Hang off call by power button while screen is on
| * \ \ \ \ \ \ am 9bf7f893: am 93df07a1: Merge "Show the keyguard if unsecure window on ↵Craig Mautner2014-03-081-24/+31
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | top. DO NOT MERGE." into klp-dev * commit '9bf7f893e0833fca9b240c11b98d6d7dc1892081': Show the keyguard if unsecure window on top. DO NOT MERGE.
| | * | | | | | 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
| * | | | | | | | am 38f81ccc: am fee6f69e: Merge "Volume panel should not clear system ui ↵John Spurlock2014-03-041-9/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flags." into klp-dev * commit '38f81ccc768958b1a9100cb2caa93ec3aedd9b5e': Volume panel should not clear system ui flags.
| | * | | | | | | Merge "Volume panel should not clear system ui flags." into klp-devJohn Spurlock2014-03-041-9/+7
| | |\ \ \ \ \ \ \
| | | * | | | | | | Volume panel should not clear system ui flags.John Spurlock2014-03-041-9/+7
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove private WM flag (used only by the volume panel) to force the clearable system UI flags clear. Instead, always lay out the volume panel as if the bars are visible, as we do for system dialogs - and don't clear the flags. Reverts part of I25f29af5b6518aba695b64a75977ae240b742118 Bug:11986621 Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57
| * | | | | | | | am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." ↵John Spurlock2014-03-041-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '49eac16ec00ea63feaafc137a1d313fcb4374b36': Show hideycling for non-primary users.
| | * | | | | | | Show hideycling for non-primary users.John Spurlock2014-03-041-0/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User 0 owns the window (system_server) but should be allowed to display on a user's behalf. Use the corresponding private flag for this system window, since we cannot classify it by type (TYPE_TOAST) in policy. Bug:12015090 Change-Id: I33aedb4624288415a5e1ae937676b693024546a9
* | | | | | | | 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
* | | | | | | 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 378c804d: am c8867b28: Merge "Report keyguard as initially showing and ↵Jim Miller2013-11-131-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | secure until we know" into klp-dev * commit '378c804d652f32547d3fe460842e5720b57bd9f1': Report keyguard as initially showing and secure until we know
| * | | | | Report keyguard as initially showing and secure until we knowJim Miller2013-11-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where an app calls KeyguardManager.isLocked() before keyguard has had a chance to show. The fix is to assume keyguard is showing and secure until we know otherwise. Fixes bug 11670159 Change-Id: Ifbe4cdf40e3b76d2069ecace940f85fa58f31187
* | | | | | am da721a99: am 778eaf4b: Merge "Disallow transient status bar on the ↵John Spurlock2013-11-111-0/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyguard." into klp-dev * commit 'da721a99febae345d28f9afa5b9679a1c54a2f6b': Disallow transient status bar on the keyguard.
| * | | | | Disallow transient status bar on the keyguard.John Spurlock2013-11-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FLAG_FULLSCREEN on the app under the keyguard was keeping the transient status bar visible if the user locked while revealing it. Bug:11629810 Change-Id: I034d3a4f4fe5463702253a1fca6d32debd520c3c
* | | | | | am 94cab389: am 1e45fd78: Merge "Fix improperly hidden status bar." into klp-devJohn Spurlock2013-11-072-10/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '94cab389e4f81d454316789fb0a6fbe954080a08': Fix improperly hidden status bar.
| * | | | | Fix improperly hidden status bar.John Spurlock2013-11-072-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An app lib exposed a possible timing problem, causing the bars to remain hidden after screen rotation during immersive mode. Bug:11440463 Change-Id: I5166bdce78a876bc08b18f8b9a340366fbbbb70a
* | | | | | am 8ed10cff: am def34eb7: Merge "Ensure bar window state is SHOWING after ↵Craig Mautner2013-11-061-3/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotate if visible." into klp-dev * commit '8ed10cff78460a0cc426dc5c1426a9edaafe3e67': Ensure bar window state is SHOWING after rotate if visible.
| * | | | | Ensure bar window state is SHOWING after rotate if visible.John Spurlock2013-11-061-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:11544694 Change-Id: Ied56f01a931f33437bdc05d026006cabcdef0149
* | | | | | am 1dbaf904: am 18612840: Merge "Force relayout at completion of status bar ↵Craig Mautner2013-10-301-1/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | animation" into klp-dev * commit '1dbaf9044dcb8a9bb6300e438a05324189bd4d02': Force relayout at completion of status bar animation
| * | | | | Force relayout at completion of status bar animationCraig Mautner2013-10-291-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A final layout pass should be done whenever the status bar has completed its incoming animation. Fixes bug 10387660. Change-Id: I48c19015c53116b58cf73e20be32d1f64dd682ca
* | | | | | am 7539a5af: am 2f566900: Merge "Ensure the simple CAB appears below the ↵John Spurlock2013-10-231-6/+62
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status bar." into klp-dev * commit '7539a5afa73e9d7bc77803295368542ef535f28c': Ensure the simple CAB appears below the status bar. Add 'no system permission' test app.
| * | | | | Ensure the simple CAB appears below the status bar.John Spurlock2013-10-221-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the contextual action bar is not in overlay mode, the screen layout is a linear layout. (screen_simple.xml) Ensure the standalone CAB appears below the status bar, consumes the top offset (to avoid content application below it) and fill in the status area with a guard view for background protection. Bug:10014069 Change-Id: I614f16dfa77367a94808aef54710ffebd66e1ca8
* | | | | | am 1eeb5ff2: am d4595bd1: Merge "Move the IME navigation guard view up to ↵John Spurlock2013-10-191-0/+32
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decor." into klp-dev * commit '1eeb5ff203a4aea5a4cfbe6c9982dc77cabd1f2b': Move the IME navigation guard view up to decor.
| * | | | | Move the IME navigation guard view up to decor.John Spurlock2013-10-181-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the IME windows are now allowed to extend into the nav bar, some IMEs were making assumptions about computed insets based on the height of the content view. So our navigation bar view (opaque view blocking the nav bar area to avoid the island effect when transparent) needs to live above the content view in the hierarchy, making the content view the same height as it was before. A surgical spot to put the guard view is up at the root view (PhoneWindow.DecorView). fitSystemWindows is always called since this view is not recreated, and the layout is stable: waiting until the IME is attached to the window is too late to add a guard view. This is above the screen_* layouts, so will work without having to touch all of them. And it only affects windows of TYPE_INPUT_METHOD. Bug:11237795 Change-Id: I6a93f30aec83f1cecfb854073046cbc87ab4aa66
* | | | | | am 0945bc15: am ac2d61a2: Merge "Do not show immersive mode help in touch ↵John Spurlock2013-10-181-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exploration mode." into klp-dev * commit '0945bc15034ac05d2ca803f6297b03dcbcbea2d8': Do not show immersive mode help in touch exploration mode.
| * | | | | Merge "Do not show immersive mode help in touch exploration mode." into klp-devJohn Spurlock2013-10-181-1/+2
| |\ \ \ \ \
| | * | | | | Do not show immersive mode help in touch exploration mode.Daniel Sandler2013-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11277364 Change-Id: Ifafcbff38e34c0ef08d9a466d93ce591369183a3
* | | | | | | am 62c19871: am da35dded: Relayout the immersive cling in the correct thread.Daniel Sandler2013-10-181-3/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '62c198719afa30eaaa0fe52caed5ed8c520ba6ce': Relayout the immersive cling in the correct thread.
| * | | | | | Relayout the immersive cling in the correct thread.Daniel Sandler2013-10-181-3/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11266364 Change-Id: Ia629262ff0c362a5a45b6c5822be080cefcb8c56
* | | | | | am 01491271: am 53cb242f: Merge "Fix issue where keyguard adds widgets ↵Jim Miller2013-10-173-0/+22
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before the system is ready" into klp-dev * commit '0149127198f9fc46a3a4f0b7f4e9579b72273b46': Fix issue where keyguard adds widgets before the system is ready
| * | | | | Fix issue where keyguard adds widgets before the system is readyJim Miller2013-10-163-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While under heavy system load, keyguard was able to create widgets before before ActivityManagerService was ready. The result was a race between keyguard adding widgets and ActivityManagerService being ready to send broadcasts. This fix provides keyguard with an additional signal to know when the system is booted and widgets are safe to load. Fixes bug b/11217169 Change-Id: I7a714d65b068678f961e52bdde4e1c20f9c287f0
* | | | | | am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." ↵Craig Mautner2013-10-141-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '2c345435458b8b6ad105bf14d3655e0f6836278b': Move the wallpaper beneath the keyguard.
| * | | | | Merge "Move the wallpaper beneath the keyguard." into klp-devCraig Mautner2013-10-141-1/+2
| |\ \ \ \ \
generated by cgit v1.1 at 2025-04-01 08:13:54 +0000