Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35a560fc authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '6666-a14-espri-v3' into 'v3.0-a14' 

Theme and display mic icon only if suggestion is available

See merge request !38
parents ef7e65aa abd60421

java/res/drawable/ic_ime_switch.xml

+8 −8
Original line number Original line Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:viewportWidth="22.97"

    android:height="24dp"

    android:viewportHeight="31.17"

    android:viewportHeight="24"

    android:width="22.97dp"

    android:viewportWidth="24"

    android:height="31.17dp">

    android:width="24dp">

    <path

    <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="@color/e_keyboard_key_text"

        android:fillColor="#DEADB5B9" />

        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>
 
</vector>

java/res/layout/main_keyboard_frame.xml

+3 −4
Original line number Original line Diff line number Diff line
@@ -51,11 +51,10 @@ 




    <ImageButton

    <ImageButton

        android:id="@+id/floating_button"

        android:id="@+id/floating_button"

        android:layout_width="48dp"

        android:layout_width="40dp"

        android:layout_height="48dp"

        android:layout_height="40dp"

        android:padding="12dp"

        android:layout_gravity="top|end"

        android:layout_gravity="top|end"

        android:layout_marginTop="-4dp"

        android:layout_marginEnd="4dp"

        android:background="@android:color/transparent"

        android:background="@android:color/transparent"

        android:src="@drawable/ic_ime_switch"

        android:src="@drawable/ic_ime_switch"

        android:contentDescription="@string/ime_switch_button"

        android:contentDescription="@string/ime_switch_button"

java/src/com/android/inputmethod/latin/LatinIME.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -912,7 +912,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
    }

    }





    private void manageFloatingButtonVisibility() {

    private void manageFloatingButtonVisibility() {

        if (shouldShowFloatingButton()) {

        final SettingsValues currentSettingsValues = mSettings.getCurrent();

        if (shouldShowFloatingButton() && currentSettingsValues.mInputAttributes.mShouldShowSuggestions) {

            floatingButton.setVisibility(View.VISIBLE);

            floatingButton.setVisibility(View.VISIBLE);

        } else {

        } else {

            floatingButton.setVisibility(View.GONE);

            floatingButton.setVisibility(View.GONE);
@@ -920,7 +921,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
    }

    }





    private boolean shouldShowFloatingButton() {

    private boolean shouldShowFloatingButton() {

        return AccountInfoContentProvider.isPremiumAccount(getApplicationContext()) && isSttKeyboardActivated();

        return AccountInfoContentProvider.isPremiumAccount(getApplicationContext()) && isSttKeyboardActivated() 

            && hasSuggestionStripView();

    }

    }





    @Override

    @Override
@@ -988,7 +990,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
    @SuppressWarnings("deprecation")

    @SuppressWarnings("deprecation")

    void onStartInputViewInternal(final EditorInfo editorInfo, final boolean restarting) {

    void onStartInputViewInternal(final EditorInfo editorInfo, final boolean restarting) {

        super.onStartInputView(editorInfo, restarting);

        super.onStartInputView(editorInfo, restarting);



        mDictionaryFacilitator.onStartInput();

        mDictionaryFacilitator.onStartInput();

        // Switch to the null consumer to handle cases leading to early exit below, for which we

        // Switch to the null consumer to handle cases leading to early exit below, for which we

        // also wouldn't be consuming gesture data.

        // also wouldn't be consuming gesture data.
@@ -1683,6 +1684,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        final boolean shouldShowSuggestionsStrip = shouldShowSuggestionsStripUnlessPassword

        final boolean shouldShowSuggestionsStrip = shouldShowSuggestionsStripUnlessPassword

                && !currentSettingsValues.mInputAttributes.mIsPasswordField;

                && !currentSettingsValues.mInputAttributes.mIsPasswordField;

        mSuggestionStripView.updateVisibility(shouldShowSuggestionsStrip, isFullscreenMode());

        mSuggestionStripView.updateVisibility(shouldShowSuggestionsStrip, isFullscreenMode());

        

        if (!shouldShowSuggestionsStrip) {

        if (!shouldShowSuggestionsStrip) {

            return;

            return;

        }

        }