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

Merge "Reset Keyguard when clicking emergency call button" into oc-dev

Browse Source 
am: ff389264d9

Change-Id: I557863570a252fc84b76198a4acf0534a55af47c
This commit is contained in:
Jorim Jaggi
2017-05-23 11:10:57 +00:00
committed by android-build-merger
parent 45956cfa46 ff389264d9
commit 53b96948f4
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -29,6 +29,7 @@ import android.view.WindowManagerGlobal;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.keyguard.KeyguardUpdateMonitorCallback;
import com.android.keyguard.ViewMediatorCallback; import com.android.keyguard.ViewMediatorCallback;
import com.android.systemui.DejankUtils; import com.android.systemui.DejankUtils;
import com.android.keyguard.LatencyTracker; import com.android.keyguard.LatencyTracker;
@@ -97,12 +98,26 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
private boolean mDeviceWillWakeUp; private boolean mDeviceWillWakeUp;
private boolean mDeferScrimFadeOut; private boolean mDeferScrimFadeOut;
private final KeyguardUpdateMonitorCallback mUpdateMonitorCallback =
new KeyguardUpdateMonitorCallback() {
@Override
public void onEmergencyCallAction() {
// Since we won't get a setOccluded call we have to reset the view manually such that
// the bouncer goes away.
if (mOccluded) {
reset(false /* hideBouncerWhenShowing */);
}
}
};
public StatusBarKeyguardViewManager(Context context, ViewMediatorCallback callback, public StatusBarKeyguardViewManager(Context context, ViewMediatorCallback callback,
LockPatternUtils lockPatternUtils) { LockPatternUtils lockPatternUtils) {
mContext = context; mContext = context;
mViewMediatorCallback = callback; mViewMediatorCallback = callback;
mLockPatternUtils = lockPatternUtils; mLockPatternUtils = lockPatternUtils;
mStatusBarWindowManager = Dependency.get(StatusBarWindowManager.class); mStatusBarWindowManager = Dependency.get(StatusBarWindowManager.class);
KeyguardUpdateMonitor.getInstance(context).registerCallback(mUpdateMonitorCallback);
} }
public void registerStatusBar(StatusBar statusBar, public void registerStatusBar(StatusBar statusBar,