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

Merge "Fix doze bug in keyguard user switcher" into sc-dev

Browse Source
This commit is contained in:
Peter Kalauskas
2021-03-04 16:14:45 +00:00
committed by Android (Google) Code Review
parent c4684fc7bc c1e331dd9c
commit e7283b94bc
3 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java
View File

@@ -405,14 +405,19 @@ public class KeyguardSliceView extends LinearLayout {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
} }
/**
* Set the amount (ratio) that the device has transitioned to doze.
*
* @param darkAmount Amount of transition to doze: 1f for doze and 0f for awake.
*/
public void setDarkAmount(float darkAmount) { public void setDarkAmount(float darkAmount) {
boolean isAwake = darkAmount != 0; boolean isDozing = darkAmount != 0;
boolean wasAwake = mDarkAmount != 0; boolean wasDozing = mDarkAmount != 0;
if (isAwake == wasAwake) { if (isDozing == wasDozing) {
return; return;
} }
mDarkAmount = darkAmount; mDarkAmount = darkAmount;
setLayoutAnimationListener(isAwake ? null : mKeepAwakeListener); setLayoutAnimationListener(isDozing ? null : mKeepAwakeListener);
} }
@Override @Override

23
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardQsUserSwitchController.java
View File

@@ -94,15 +94,6 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
goingToFullShade, goingToFullShade,
oldState); oldState);
} }
@Override
public void onDozeAmountChanged(float linearAmount, float amount) {
if (DEBUG) {
Log.d(TAG, String.format("onDozeAmountChanged: linearAmount=%f amount=%f",
linearAmount, amount));
}
setDarkAmount(amount);
}
}; };
@Inject @Inject
@@ -294,20 +285,6 @@ public class KeyguardQsUserSwitchController extends ViewController<UserAvatarVie
} }
} }
/**
* Set the amount (ratio) that the device has transitioned to doze.
*
* @param darkAmount Amount of transition to doze: 1f for doze and 0f for awake.
*/
private void setDarkAmount(float darkAmount) {
boolean isAwake = darkAmount != 0;
if (darkAmount == mDarkAmount) {
return;
}
mDarkAmount = darkAmount;
mView.setVisibility(isAwake ? View.VISIBLE : View.GONE);
}
private boolean isListAnimating() { private boolean isListAnimating() {
return mKeyguardVisibilityHelper.isVisibilityAnimating(); return mKeyguardVisibilityHelper.isVisibilityAnimating();
} }

7
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardUserSwitcherController.java
View File

@@ -205,7 +205,7 @@ public class KeyguardUserSwitcherController extends ViewController<KeyguardUserS
protected void onViewAttached() { protected void onViewAttached() {
if (DEBUG) Log.d(TAG, "onViewAttached"); if (DEBUG) Log.d(TAG, "onViewAttached");
mAdapter.registerDataSetObserver(mDataSetObserver); mAdapter.registerDataSetObserver(mDataSetObserver);
mDataSetObserver.onChanged(); mAdapter.notifyDataSetChanged();
mKeyguardUpdateMonitor.registerCallback(mInfoCallback); mKeyguardUpdateMonitor.registerCallback(mInfoCallback);
mStatusBarStateController.addCallback(mStatusBarStateListener); mStatusBarStateController.addCallback(mStatusBarStateListener);
mScreenLifecycle.addObserver(mScreenObserver); mScreenLifecycle.addObserver(mScreenObserver);
@@ -373,14 +373,13 @@ public class KeyguardUserSwitcherController extends ViewController<KeyguardUserS
* @param darkAmount Amount of transition to doze: 1f for doze and 0f for awake. * @param darkAmount Amount of transition to doze: 1f for doze and 0f for awake.
*/ */
private void setDarkAmount(float darkAmount) { private void setDarkAmount(float darkAmount) {
boolean isAwake = darkAmount != 0; boolean isFullyDozed = darkAmount == 1;
if (darkAmount == mDarkAmount) { if (darkAmount == mDarkAmount) {
return; return;
} }
mDarkAmount = darkAmount; mDarkAmount = darkAmount;
mListView.setDarkAmount(darkAmount); mListView.setDarkAmount(darkAmount);
mView.setVisibility(isAwake ? View.VISIBLE : View.GONE); if (isFullyDozed) {
if (!isAwake) {
closeSwitcherIfOpenAndNotSimple(false); closeSwitcherIfOpenAndNotSimple(false);
} }
} }