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

Merge "Use logout button + owner for max # notifs calc"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-21 01:06:51 +00:00
committed by Android (Google) Code Review
parent 531245a7e9 9f515695ae
commit 577a07c09f
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -178,6 +178,13 @@ public class KeyguardStatusView extends GridLayout {
return mLogoutView.getVisibility() == VISIBLE ? mLogoutView.getHeight() : 0;
}
int getOwnerInfoHeight() {
if (mOwnerInfo == null) {
return 0;
}
return mOwnerInfo.getVisibility() == VISIBLE ? mOwnerInfo.getHeight() : 0;
}
void updateLogoutView() {
if (mLogoutView == null) {
return;

7
packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
View File

@@ -129,6 +129,13 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
return mView.getLogoutButtonHeight();
}
/**
* Get the height of the logout button.
*/
public int getOwnerInfoHeight() {
return mView.getOwnerInfoHeight();
}
/**
* Set keyguard status view alpha.
*/

12
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -1861,7 +1861,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
@Override
public void onChange(boolean selfChange) {
updateLockScreenMode();
mHandler.sendEmptyMessage(MSG_LOCK_SCREEN_MODE);
}
};
mContext.getContentResolver().registerContentObserver(
@@ -1870,14 +1869,22 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
}
private void updateLockScreenMode() {
mLockScreenMode = Settings.Global.getInt(mContext.getContentResolver(),
final int newMode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.SHOW_NEW_LOCKSCREEN,
isUdfpsEnrolled() ? 1 : 0);
if (newMode != mLockScreenMode) {
mLockScreenMode = newMode;
mHandler.sendEmptyMessage(MSG_LOCK_SCREEN_MODE);
}
}
private void updateUdfpsEnrolled(int userId) {
mIsUdfpsEnrolled = mAuthController.isUdfpsEnrolled(userId);
}
/**
* @return true if there's at least one udfps enrolled
*/
public boolean isUdfpsEnrolled() {
return mIsUdfpsEnrolled;
}
@@ -1917,6 +1924,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
return;
}
// TODO: Add support for multiple fingerprint sensors, b/173730729
boolean shouldListenForFingerprint =
isUdfpsEnrolled() ? shouldListenForUdfps() : shouldListenForFingerprint();
boolean runningOrRestarting = mFingerprintRunningState == BIOMETRIC_STATE_RUNNING

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -926,6 +926,8 @@ public class NotificationPanelViewController extends PanelViewController {
if (mUpdateMonitor.isUdfpsEnrolled()) {
availableSpace = mNotificationStackScrollLayoutController.getHeight()
- minPadding - shelfSize
- mKeyguardStatusViewController.getOwnerInfoHeight()
- mKeyguardStatusViewController.getLogoutButtonHeight()
- (mStatusBar.getDisplayHeight() - mAuthController.getUdfpsRegion().top);
}