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

Commit fa100963 authored by Michael Jurka's avatar Michael Jurka
Browse files

Revert "Add shortcut for voice search" 

This reverts commit 7a348955.

Change-Id: Iddfa86183ff0d189e8dbb5dc535344e064e0d103
parent 4441a369

core/res/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ 
            0 - Nothing

            1 - Recent apps dialog

            2 - Recent apps view in SystemUI

            3 - Voice search

         This needs to match the constants in

         policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

    -->

packages/SystemUI/res/layout/navigation_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
                android:layout_height="match_parent"

                android:src="@drawable/ic_sysbar_home"

                systemui:keyCode="3"

                systemui:keyRepeat="true"

                systemui:keyRepeat="false"

                android:layout_weight="0"

                systemui:glowBackground="@drawable/ic_sysbar_highlight"

                android:contentDescription="@string/accessibility_home"

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+0 −16
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    static final int LONG_PRESS_HOME_NOTHING = 0;

    static final int LONG_PRESS_HOME_RECENT_DIALOG = 1;

    static final int LONG_PRESS_HOME_RECENT_SYSTEM_UI = 2;

    static final int LONG_PRESS_HOME_VOICE_SEARCH = 3;



    // wallpaper is at the bottom, though the window manager may move it.

    static final int WALLPAPER_LAYER = 2;
@@ -758,9 +757,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mLongPressOnHomeBehavior > LONG_PRESS_HOME_RECENT_SYSTEM_UI) {

                mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;

            }

            if (hasNavigationBar()) {

                mLongPressOnHomeBehavior = LONG_PRESS_HOME_VOICE_SEARCH;

            }

        }



        if (mLongPressOnHomeBehavior != LONG_PRESS_HOME_NOTHING) {
@@ -780,18 +776,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            } catch (RemoteException e) {

                Slog.e(TAG, "RemoteException when showing recent apps", e);

            }

        } else if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_VOICE_SEARCH) {

            Intent intent = new Intent(RecognizerIntent.ACTION_WEB_SEARCH);

            try {

                intent.setFlags(

                    Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

                mContext.startActivity(intent);

            } catch (ActivityNotFoundException e) {

                Log.e(TAG, "Unable to launch. tag=" + TAG + " intent=" + intent, e);

            } catch (SecurityException e) {

                Log.e(TAG, "PhoneWindowManager does not have the permission to launch " +

                      "tag=" + TAG + " intent=" + intent, e);

            }

        }

    }