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

Merge "resolve merge conflicts of 8f1d13300f to oc-dr1-dev" into oc-dr1-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2017-06-13 00:21:21 +00:00
committed by Android (Google) Code Review
parent f7dc56ecc9 ee18e78d81
commit c14f46b135
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
private boolean mLastBouncerDismissible; private boolean mLastBouncerDismissible;
protected boolean mLastRemoteInputActive; protected boolean mLastRemoteInputActive;
private boolean mLastDozing; private boolean mLastDozing;
private boolean mLastDeferScrimFadeOut;
private OnDismissAction mAfterKeyguardGoneAction; private OnDismissAction mAfterKeyguardGoneAction;
private final ArrayList<Runnable> mAfterKeyguardGoneRunnables = new ArrayList<>(); private final ArrayList<Runnable> mAfterKeyguardGoneRunnables = new ArrayList<>();
@@ -371,7 +372,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mStatusBar.setKeyguardFadingAway(startTime, delay, fadeoutDuration); mStatusBar.setKeyguardFadingAway(startTime, delay, fadeoutDuration);
mFingerprintUnlockController.startKeyguardFadingAway(); mFingerprintUnlockController.startKeyguardFadingAway();
mBouncer.hide(true /* destroyView */); mBouncer.hide(true /* destroyView */);
updateStates();
if (wakeUnlockPulsing) { if (wakeUnlockPulsing) {
mStatusBarWindowManager.setKeyguardFadingAway(true); mStatusBarWindowManager.setKeyguardFadingAway(true);
mStatusBar.fadeKeyguardWhilePulsing(); mStatusBar.fadeKeyguardWhilePulsing();
@@ -403,6 +403,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mFingerprintUnlockController.finishKeyguardFadingAway(); mFingerprintUnlockController.finishKeyguardFadingAway();
} }
} }
updateStates();
mStatusBarWindowManager.setKeyguardShowing(false); mStatusBarWindowManager.setKeyguardShowing(false);
mViewMediatorCallback.keyguardGone(); mViewMediatorCallback.keyguardGone();
} }
@@ -574,7 +575,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
mLastBouncerDismissible = bouncerDismissible; mLastBouncerDismissible = bouncerDismissible;
mLastRemoteInputActive = remoteInputActive; mLastRemoteInputActive = remoteInputActive;
mLastDozing = mDozing; mLastDozing = mDozing;
mLastDeferScrimFadeOut = mDeferScrimFadeOut;
mStatusBar.onKeyguardViewManagerStatesUpdated(); mStatusBar.onKeyguardViewManagerStatesUpdated();
} }
@@ -582,15 +583,16 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
* @return Whether the navigation bar should be made visible based on the current state. * @return Whether the navigation bar should be made visible based on the current state.
*/ */
protected boolean isNavBarVisible() { protected boolean isNavBarVisible() {
return !(mShowing && !mOccluded) && !mDozing || mBouncer.isShowing() || mRemoteInputActive; return (!(mShowing && !mOccluded) && !mDozing || mBouncer.isShowing() || mRemoteInputActive)
&& !mDeferScrimFadeOut;
} }
/** /**
* @return Whether the navigation bar was made visible based on the last known state. * @return Whether the navigation bar was made visible based on the last known state.
*/ */
protected boolean getLastNavBarVisible() { protected boolean getLastNavBarVisible() {
return !(mLastShowing && !mLastOccluded) && !mLastDozing || mLastBouncerShowing return (!(mLastShowing && !mLastOccluded) && !mLastDozing || mLastBouncerShowing
|| mLastRemoteInputActive; || mLastRemoteInputActive) && !mLastDeferScrimFadeOut;
} }
public boolean shouldDismissOnMenuPressed() { public boolean shouldDismissOnMenuPressed() {

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

@@ -3052,13 +3052,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (PRINT_ANIM) Log.i(TAG, "selectAnimation in " + win if (PRINT_ANIM) Log.i(TAG, "selectAnimation in " + win
+ ": transit=" + transit); + ": transit=" + transit);
if (win == mStatusBar) { if (win == mStatusBar) {
boolean isKeyguard = (win.getAttrs().privateFlags & PRIVATE_FLAG_KEYGUARD) != 0; final boolean isKeyguard = (win.getAttrs().privateFlags & PRIVATE_FLAG_KEYGUARD) != 0;
final boolean expanded = win.getAttrs().height == MATCH_PARENT
&& win.getAttrs().width == MATCH_PARENT;
if (isKeyguard || expanded) {
return -1;
}
if (transit == TRANSIT_EXIT if (transit == TRANSIT_EXIT
|| transit == TRANSIT_HIDE) { || transit == TRANSIT_HIDE) {
return isKeyguard ? -1 : R.anim.dock_top_exit; return R.anim.dock_top_exit;
} else if (transit == TRANSIT_ENTER } else if (transit == TRANSIT_ENTER
|| transit == TRANSIT_SHOW) { || transit == TRANSIT_SHOW) {
return isKeyguard ? -1 : R.anim.dock_top_enter; return R.anim.dock_top_enter;
} }
} else if (win == mNavigationBar) { } else if (win == mNavigationBar) {
if (win.getAttrs().windowAnimations != 0) { if (win.getAttrs().windowAnimations != 0) {
@@ -6793,7 +6798,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
@Override @Override
public boolean isScreenOn() { public boolean isScreenOn() {
return mScreenOnFully; synchronized (mLock) {
return mScreenOnEarly;
}
} }
/** {@inheritDoc} */ /** {@inheritDoc} */