Merge "Smartspace location fix" into sc-dev am: de56089eed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805272

Change-Id: I769fd9c9b64d5d46ef043d535e748eb18f391d10
This commit is contained in:
Matt Pietal
2021-06-03 17:27:33 +00:00
committed by Automerger Merge Worker

View File

@@ -192,7 +192,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
if (indexOfChild(in) == -1) addView(in); if (indexOfChild(in) == -1) addView(in);
direction = -1; direction = -1;
smartspaceYTranslation = mSmartspaceView == null ? 0 smartspaceYTranslation = mSmartspaceView == null ? 0
: mClockFrame.getY() - mSmartspaceView.getY(); : mClockFrame.getTop() - mSmartspaceView.getTop();
} else { } else {
in = mClockFrame; in = mClockFrame;
out = mLargeClockFrame; out = mLargeClockFrame;