Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add shortcut for voice search"" into jb-dev

Browse Source
This commit is contained in:
Michael Jurka
2012-05-16 16:39:16 -07:00
committed by Android (Google) Code Review
parent ee499fe68e fa1009638d
commit 28e7320116
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/res/res/values/config.xml
View File

@@ -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
-->

2
packages/SystemUI/res/layout/navigation_bar.xml
View File

@@ -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"

16
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -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;
@@ -759,9 +758,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) {
@@ -781,18 +777,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);
}
}
}