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

Commit 1cecd222 authored by Stephen Bird's avatar Stephen Bird
Browse files

Trebuchet: fix voice button proxy 

Change-Id: I1f7243063fa0596f5f9cb3b40c4cee63545d04e3
(cherry picked from commit a433e1da)
(cherry picked from commit 004115fe)
parent 50f8d984

src/com/android/launcher3/Launcher.java

+6 −1
Original line number Diff line number Diff line
@@ -338,6 +338,8 @@ public class Launcher extends Activity 
    private boolean mHasFocus = false;

    private boolean mAttached = false;



    private boolean mShouldShowVoice = false;



    private static LocaleConfiguration sLocaleConfiguration = null;



    private static HashMap<Long, FolderInfo> sFolders = new HashMap<Long, FolderInfo>();
@@ -4407,6 +4409,7 @@ public class Launcher extends Activity 
            if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);

            if (searchButton != null) searchButton.setVisibility(View.GONE);

            if (voiceButton != null) voiceButton.setVisibility(View.GONE);

            mShouldShowVoice = false;

            updateVoiceButtonProxyVisible(true);

            return false;

        }
@@ -4456,10 +4459,12 @@ public class Launcher extends Activity 
            voiceButton.setVisibility(View.VISIBLE);

            updateVoiceButtonProxyVisible(false);

            invalidatePressedFocusedStates(voiceButtonContainer, voiceButton);

            mShouldShowVoice = true;

            return true;

        } else {

            if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);

            if (voiceButton != null) voiceButton.setVisibility(View.GONE);

            mShouldShowVoice = false;

            updateVoiceButtonProxyVisible(true);

            return false;

        }
@@ -4476,7 +4481,7 @@ public class Launcher extends Activity 
        final View voiceButtonProxy = findViewById(R.id.voice_button_proxy);

        if (voiceButtonProxy != null) {

            boolean visible = !forceDisableVoiceButtonProxy &&

                    mWorkspace.shouldVoiceButtonProxyBeVisible();

                    mWorkspace.shouldVoiceButtonProxyBeVisible() && mShouldShowVoice;

            voiceButtonProxy.setVisibility(visible ? View.VISIBLE : View.GONE);

            voiceButtonProxy.bringToFront();

        }