From 53c66b8b844407b864a42a448f44646bc07694e9 Mon Sep 17 00:00:00 2001 From: Helium314 Date: Sun, 2 Jun 2024 14:03:09 +0200 Subject: [PATCH] fix toolbar being visible when device is locked and auto-show toolbar is on --- .../latin/suggestions/SuggestionStripView.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java b/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java index 311781fef..28f93c63e 100644 --- a/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java +++ b/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.java @@ -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) {