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

Request transient bars after panic

Browse Source 
Bug: 19282730
Change-Id: Ib621a837ba06847a02333e1786ea50e5d854c7d7
This commit is contained in:
Adrian Roos
2015-05-21 16:28:27 -07:00
parent 3e8dd514a0
commit ddc8b27878
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -51,7 +51,6 @@ import android.media.IAudioService;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.media.session.MediaSessionLegacyHelper;
import android.os.Build;
import android.os.Bundle;
import android.os.Debug;
import android.os.FactoryTest;
@@ -97,7 +96,6 @@ import com.android.internal.policy.PhoneWindow;
import android.view.Surface;
import android.view.View;
import android.view.ViewConfiguration;
import android.view.ViewRootImpl;
import android.view.Window;
import android.view.WindowManager;
import android.view.WindowManagerGlobal;
@@ -209,6 +207,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
.setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
.build();
// The panic gesture may become active only after the keyguard is dismissed and the immersive
// app shows again. If that doesn't happen for 30s we drop the gesture.
private static final long PANIC_GESTURE_EXPIRATION = 30000;
/**
* Keyguard stuff
*/
@@ -457,6 +459,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// What we last reported to system UI about whether the compatibility
// menu needs to be displayed.
boolean mLastFocusNeedsMenu = false;
// If nonzero, a panic gesture was performed at that time in uptime millis and is still pending.
private long mPendingPanicGestureUptime;
FakeWindow mHideNavFakeWindow = null;
@@ -864,7 +868,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,
SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags));
if (panic) {
mHandler.post(mRequestTransientNav);
mHandler.post(mHiddenNavPanic);
}
// Latch power key state to detect screenshot chord.
@@ -5184,10 +5188,17 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
};
private final Runnable mRequestTransientNav = new Runnable() {
private final Runnable mHiddenNavPanic = new Runnable() {
@Override
public void run() {
requestTransientBars(mNavigationBar);
synchronized (mWindowManagerFuncs.getWindowManagerLock()) {
if (!isUserSetupComplete()) {
// Swipe-up for navigation bar is disabled during setup
return;
}
mPendingPanicGestureUptime = SystemClock.uptimeMillis();
mNavigationBarController.showTransient();
}
}
};
@@ -6351,6 +6362,17 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mNavigationBar != null &&
hideNavBarSysui && immersiveSticky;
final long now = SystemClock.uptimeMillis();
final boolean pendingPanic = mPendingPanicGestureUptime != 0
&& now - mPendingPanicGestureUptime <= PANIC_GESTURE_EXPIRATION;
if (pendingPanic && hideNavBarSysui && !isStatusBarKeyguard() && mKeyguardDrawComplete) {
// The user performed the panic gesture recently, we're about to hide the bars,
// we're no longer on the Keyguard and the screen is ready. We can now request the bars.
mPendingPanicGestureUptime = 0;
mStatusBarController.showTransient();
mNavigationBarController.showTransient();
}
boolean denyTransientStatus = mStatusBarController.isTransientShowRequested()
&& !transientStatusBarAllowed && hideStatusBarSysui;
boolean denyTransientNav = mNavigationBarController.isTransientShowRequested()