From 50262e587ccd4b2fb0aa28c3b2f779b536825639 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Fri, 26 Nov 2010 14:04:54 -0800
Subject: [PATCH] Long press on home shouldn't open recents

Change-Id: Iafb8205878768b74a833528532ab399d44b04263
---
 core/res/res/values-xlarge/config.xml                          | 2 +-
 core/res/res/values/config.xml                                 | 2 +-
 .../com/android/internal/policy/impl/PhoneWindowManager.java   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/res/res/values-xlarge/config.xml b/core/res/res/values-xlarge/config.xml
index 37f59c88e1fcd..8ed1c3eabcab5 100644
--- a/core/res/res/values-xlarge/config.xml
+++ b/core/res/res/values-xlarge/config.xml
@@ -31,7 +31,7 @@
     <bool name="config_enableLockScreenRotation">true</bool>
 
     <!-- see comment in values/config.xml -->
-    <integer name="config_longPressOnHomeBehavior">1</integer>
+    <integer name="config_longPressOnHomeBehavior">0</integer>
 
 </resources>
 
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 61223b3468c11..03d581f151c12 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -355,7 +355,7 @@
             1 - Recent apps dialog
             2 - Recent apps activity in SystemUI
     -->
-    <integer name="config_longPressOnHomeBehavior">0</integer>
+    <integer name="config_longPressOnHomeBehavior">1</integer>
 
     <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
          The N entries of this array define N + 1 zones as follows:
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index f892e9e9293af..137362728e8ba 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -588,7 +588,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         // We can't initialize this in init() since the configuration hasn't been loaded yet.
         if (mLongPressOnHomeBehavior < 0) {
             mLongPressOnHomeBehavior
-                    = mContext.getResources().getInteger(R.integer.config_longPressOnPowerBehavior);
+                    = mContext.getResources().getInteger(R.integer.config_longPressOnHomeBehavior);
             if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING ||
                     mLongPressOnHomeBehavior > LONG_PRESS_HOME_RECENT_ACTIVITY) {
                 mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;
@@ -600,7 +600,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             sendCloseSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS);
         }
         
-        // Use 3d Recents dialog
         if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_DIALOG) {
             // Fallback to dialog if we fail to launch the above.
             if (mRecentAppsDialog == null) {