Merge "Smartspace location fix" into sc-dev

This commit is contained in:
Matt Pietal
2021-06-03 17:12:31 +00:00
committed by Android (Google) Code Review

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;