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

Merge "Update udfps fade + padding" into sc-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-07-12 12:36:46 +00:00
committed by Android (Google) Code Review
parent 38f16f29d8 b7ce2600b4
commit 7a900474fb
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/dimens.xml
View File

@@ -681,6 +681,9 @@
<!-- The height of the divider between the individual notifications. --> <!-- The height of the divider between the individual notifications. -->
<dimen name="notification_divider_height">2dp</dimen> <dimen name="notification_divider_height">2dp</dimen>
<!-- The min distance the notifications should be from the lock icon on the lock screen. -->
<dimen name="min_lock_icon_padding">48dp</dimen>
<!-- The corner radius of the shadow behind the notification. --> <!-- The corner radius of the shadow behind the notification. -->
<dimen name="notification_shadow_radius">0dp</dimen> <dimen name="notification_shadow_radius">0dp</dimen>

16
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@@ -98,7 +98,8 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
private float mHeightPixels; private float mHeightPixels;
private float mWidthPixels; private float mWidthPixels;
private float mDensity; private float mDensity;
private int mKgBottomAreaHeight; private int mAmbientIndicationHeight; // in pixels
private int mKgIndicationHeight; // in pixels
private boolean mShowUnlockIcon; private boolean mShowUnlockIcon;
private boolean mShowLockIcon; private boolean mShowLockIcon;
@@ -280,7 +281,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mWidthPixels = metrics.widthPixels; mWidthPixels = metrics.widthPixels;
mHeightPixels = metrics.heightPixels; mHeightPixels = metrics.heightPixels;
mDensity = metrics.density; mDensity = metrics.density;
mKgBottomAreaHeight = mView.getContext().getResources().getDimensionPixelSize( mKgIndicationHeight = mView.getContext().getResources().getDimensionPixelSize(
R.dimen.keyguard_indication_margin_bottom) R.dimen.keyguard_indication_margin_bottom)
+ mView.getContext().getResources().getDimensionPixelSize( + mView.getContext().getResources().getDimensionPixelSize(
R.dimen.keyguard_indication_bottom_padding); R.dimen.keyguard_indication_bottom_padding);
@@ -295,15 +296,24 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
} else { } else {
final float distAboveKgBottomArea = 12 * mDensity; final float distAboveKgBottomArea = 12 * mDensity;
final float radius = 36 * mDensity; final float radius = 36 * mDensity;
final int kgBottomAreaHeight = Math.max(mKgIndicationHeight, mAmbientIndicationHeight);
mView.setCenterLocation( mView.setCenterLocation(
new PointF(mWidthPixels / 2, new PointF(mWidthPixels / 2,
mHeightPixels - mKgBottomAreaHeight - distAboveKgBottomArea mHeightPixels - kgBottomAreaHeight - distAboveKgBottomArea
- radius / 2), (int) radius); - radius / 2), (int) radius);
} }
mView.getHitRect(mSensorTouchLocation); mView.getHitRect(mSensorTouchLocation);
} }
/**
* Set the location of ambient indication if showing (ie: now playing)
*/
public void setAmbientIndicationBottomPadding(int ambientIndicationBottomPadding) {
mAmbientIndicationHeight = ambientIndicationBottomPadding;
updateLockIconLocation();
}
@Override @Override
public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) { public void dump(@NonNull FileDescriptor fd, @NonNull PrintWriter pw, @NonNull String[] args) {
pw.println("mUdfpsEnrolled: " + mUdfpsEnrolled); pw.println("mUdfpsEnrolled: " + mUdfpsEnrolled);

8
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
View File

@@ -41,6 +41,7 @@ import com.android.systemui.util.concurrency.DelayableExecutor;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
/** /**
* Class that coordinates non-HBM animations during keyguard authentication. * Class that coordinates non-HBM animations during keyguard authentication.
* *
@@ -207,7 +208,7 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
return true; return true;
} }
if (mInputBouncerHiddenAmount < .4f || mIsBouncerVisible) { if (mInputBouncerHiddenAmount < .5f || mIsBouncerVisible) {
return true; return true;
} }
@@ -279,8 +280,9 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
private void updateAlpha() { private void updateAlpha() {
// fade icon on transition to showing bouncer // fade icon on transition to showing bouncer
int alpha = mShowingUdfpsBouncer ? 255 int alpha = mShowingUdfpsBouncer ? 255
: Math.abs((int) MathUtils.constrainedMap(0f, 255f, .4f, .7f, : (int) MathUtils.constrain(
mInputBouncerHiddenAmount)); MathUtils.map(.5f, .9f, 0f, 255f, mInputBouncerHiddenAmount),
0f, 255f);
alpha *= (1.0f - mTransitionToFullShadeProgress); alpha *= (1.0f - mTransitionToFullShadeProgress);
mView.setUnpausedAlpha(alpha); mView.setUnpausedAlpha(alpha);
} }

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

@@ -1350,7 +1350,8 @@ public class NotificationPanelViewController extends PanelViewController {
float lockIconPadding = 0; float lockIconPadding = 0;
if (mLockIconViewController.getTop() != 0) { if (mLockIconViewController.getTop() != 0) {
lockIconPadding = mStatusBar.getDisplayHeight() - mLockIconViewController.getTop(); lockIconPadding = mStatusBar.getDisplayHeight() - mLockIconViewController.getTop()
+ mResources.getDimensionPixelSize(R.dimen.min_lock_icon_padding);
} }
float bottomPadding = Math.max(mIndicationBottomPadding, mAmbientIndicationBottomPadding); float bottomPadding = Math.max(mIndicationBottomPadding, mAmbientIndicationBottomPadding);
@@ -3627,6 +3628,8 @@ public class NotificationPanelViewController extends PanelViewController {
public void setAmbientIndicationBottomPadding(int ambientIndicationBottomPadding) { public void setAmbientIndicationBottomPadding(int ambientIndicationBottomPadding) {
if (mAmbientIndicationBottomPadding != ambientIndicationBottomPadding) { if (mAmbientIndicationBottomPadding != ambientIndicationBottomPadding) {
mAmbientIndicationBottomPadding = ambientIndicationBottomPadding; mAmbientIndicationBottomPadding = ambientIndicationBottomPadding;
mLockIconViewController.setAmbientIndicationBottomPadding(
mAmbientIndicationBottomPadding);
updateMaxDisplayedNotifications(true); updateMaxDisplayedNotifications(true);
} }
} }