fix toolbar being visible when device is locked and auto-show toolbar is on

This commit is contained in:
Helium314 2024-06-02 14:03:09 +02:00
parent bc1e4d52a8
commit 53c66b8b84

View file

@ -687,7 +687,15 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
}
public void setToolbarVisibility(final boolean visible) {
if (visible) {
final KeyguardManager km = (KeyguardManager) getContext().getSystemService(Context.KEYGUARD_SERVICE);
final boolean locked = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1
? km.isDeviceLocked()
: km.isKeyguardLocked();
if (locked) {
mPinnedKeys.setVisibility(GONE);
mSuggestionsStrip.setVisibility(VISIBLE);
mToolbarContainer.setVisibility(GONE);
} else if (visible) {
mPinnedKeys.setVisibility(GONE);
mSuggestionsStrip.setVisibility(GONE);
mToolbarContainer.setVisibility(VISIBLE);
@ -696,7 +704,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mSuggestionsStrip.setVisibility(VISIBLE);
mPinnedKeys.setVisibility(VISIBLE);
}
mToolbarExpandKey.setScaleX((visible ? -1f : 1f) * mRtl);
mToolbarExpandKey.setScaleX((visible && !locked ? -1f : 1f) * mRtl);
}
private void addKeyToPinnedKeys(final ToolbarKey pinnedKey) {