Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7ae9c5a authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am e0515914: Merge "Show IME over keyguard if IME target is showing" into lmp-dev 

* commit 'e0515914937496003f19f1e76b8f1f2abbddf35c':
  Show IME over keyguard if IME target is showing
parents 115982fd 7dbfbc7d

packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiAccessPointController.java

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ public class WifiAccessPointController { 
        final List<AccessPoint> aps = new ArrayList<AccessPoint>(scanResults.size());

        final ArraySet<String> ssids = new ArraySet<String>();

        for (ScanResult scanResult : scanResults) {

            if (scanResult == null) {

                continue;

            }

            final String ssid = scanResult.SSID;

            if (TextUtils.isEmpty(ssid) || ssids.contains(ssid)) continue;

            if (!configured.containsKey(ssid)) continue;

services/core/java/com/android/server/wm/WindowAnimator.java

+6 −1
Original line number Diff line number Diff line
@@ -248,6 +248,10 @@ public class WindowAnimator { 


        mForceHiding = KEYGUARD_NOT_SHOWN;



        final WindowState imeTarget = mService.mInputMethodTarget;

        final boolean showImeOverKeyguard = imeTarget != null && imeTarget.isVisibleNow() &&

                (imeTarget.getAttrs().flags & FLAG_SHOW_WHEN_LOCKED) != 0;



        for (int i = windows.size() - 1; i >= 0; i--) {

            WindowState win = windows.get(i);

            WindowStateAnimator winAnimator = win.mWinAnimator;
@@ -312,7 +316,8 @@ public class WindowAnimator { 
                            + " hidden=" + win.mRootToken.hidden

                            + " anim=" + win.mWinAnimator.mAnimation);

                } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {

                    final boolean hideWhenLocked = (flags & FLAG_SHOW_WHEN_LOCKED) == 0;

                    final boolean hideWhenLocked = (flags & FLAG_SHOW_WHEN_LOCKED) == 0 &&

                            !(win.mIsImWindow && showImeOverKeyguard);

                    final boolean changed;

                    if (((mForceHiding == KEYGUARD_ANIMATING_IN)

                                && (!winAnimator.isAnimating() || hideWhenLocked))