Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '9f936d6a6fa506f8bfc2916a426f1f197dd7c156':
  Show IME over keyguard if IME target is showing
This commit is contained in:
Craig Mautner
2014-08-27 04:20:16 +00:00
committed by Android Git Automerger
parent 584cce1ce9 d7ae9c5a47
commit 9ea9a37c81
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

7
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -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))