From 714a65cdcdb3e017c4c717c2f597568e4e534161 Mon Sep 17 00:00:00 2001
From: frankpreel <frank.preel@espridigital.fr>
Date: Wed, 14 May 2025 17:14:04 +0200
Subject: [PATCH] Theme and display mic icon only if suggestion is available
 REF: https://gitlab.e.foundation/e/os/backlog/-/issues/3312#note_678851
 https://gitlab.e.foundation/e/os/backlog/-/issues/3066
 https://gitlab.e.foundation/e/os/backlog/-/issues/3323

---
 java/res/drawable/ic_ime_switch.xml              | 16 ++++++++--------
 java/res/layout/main_keyboard_frame.xml          |  7 +++----
 .../com/android/inputmethod/latin/LatinIME.java  |  6 ++++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/java/res/drawable/ic_ime_switch.xml b/java/res/drawable/ic_ime_switch.xml
index 2302161c1c..128cd4451e 100644
--- a/java/res/drawable/ic_ime_switch.xml
+++ b/java/res/drawable/ic_ime_switch.xml
@@ -1,9 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="22.97"
-    android:viewportHeight="31.17"
-    android:width="22.97dp"
-    android:height="31.17dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
     <path
-        android:pathData="M11.48 19.69c2.72 0 4.91 -2.2 4.91 -4.92l0.02 -9.84c0 -2.72 -2.2 -4.92 -4.92 -4.92s-4.92 2.2 -4.92 4.92v9.84c0 2.72 2.2 4.92 4.92 4.92ZM20.18 14.77c0 4.92 -4.17 8.37 -8.7 8.37S2.79 19.69 2.79 14.77H0c0 5.59 4.46 10.22 9.84 11.03v5.38h3.28v-5.38c5.38 -0.79 9.84 -5.41 9.84 -11.03h-2.79Z"
-        android:fillColor="#DEADB5B9" />
-</vector>
\ No newline at end of file
+        android:fillColor="@color/e_keyboard_key_text"
+        android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/java/res/layout/main_keyboard_frame.xml b/java/res/layout/main_keyboard_frame.xml
index 89e0f3a96a..4fe2f984a6 100644
--- a/java/res/layout/main_keyboard_frame.xml
+++ b/java/res/layout/main_keyboard_frame.xml
@@ -51,11 +51,10 @@
 
     <ImageButton
         android:id="@+id/floating_button"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:padding="12dp"
         android:layout_gravity="top|end"
-        android:layout_marginTop="-4dp"
-        android:layout_marginEnd="4dp"
         android:background="@android:color/transparent"
         android:src="@drawable/ic_ime_switch"
         android:contentDescription="@string/ime_switch_button"
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index eb7bfcbebd..09cfb82948 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -894,7 +894,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     }
 
     private void manageFloatingButtonVisibility() {
-        if (shouldShowFloatingButton()) {
+        final SettingsValues currentSettingsValues = mSettings.getCurrent();
+        if (shouldShowFloatingButton() && currentSettingsValues.mInputAttributes.mShouldShowSuggestions) {
             floatingButton.setVisibility(View.VISIBLE);
         } else {
             floatingButton.setVisibility(View.GONE);
@@ -902,7 +903,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     }
 
     private boolean shouldShowFloatingButton() {
-        return AccountInfoContentProvider.isPremiumAccount(getApplicationContext()) && isSttKeyboardActivated();
+        return AccountInfoContentProvider.isPremiumAccount(getApplicationContext()) && isSttKeyboardActivated() 
+            && hasSuggestionStripView();
     }
 
     @Override
-- 
GitLab