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

Turn off the long press on home action

Browse Source 
Change-Id: I8b083e9e9b8bde4751264de18e5400434b315848
This commit is contained in:
Joe Onorato
2010-11-22 17:37:27 -08:00
parent 9123cbfe80
commit 46b0d6861c
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values-xlarge/config.xml
View File

@@ -30,8 +30,8 @@
<!-- Enable lockscreen rotation -->
<bool name="config_enableLockScreenRotation">true</bool>
<!-- Enables 3d task switcher on xlarge device -->
<bool name="config_enableRecentApps3D">true</bool>
<!-- see comment in values/config.xml -->
<integer name="config_longPressOnHomeBehavior">1</integer>
</resources>

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

@@ -346,8 +346,12 @@
<!-- Diable lockscreen rotation by default -->
<bool name="config_enableLockScreenRotation">false</bool>
<!-- Enable 3D RecentApplications view -->
<bool name="config_enableRecentApps3D">false</bool>
<!-- Control the behavior when the user long presses the power button.
0 - Nothing
1 - Recent apps dialog
2 - Recent apps activity in SystemUI
-->
<integer name="config_longPressOnHomeBehavior">0</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:

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

@@ -139,6 +139,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
static final int LONG_PRESS_POWER_SHUT_OFF = 2;
static final int LONG_PRESS_HOME_NOTHING = 0;
static final int LONG_PRESS_HOME_RECENT_DIALOG = 1;
static final int LONG_PRESS_HOME_RECENT_ACTIVITY = 2;
// wallpaper is at the bottom, though the window manager may move it.
static final int WALLPAPER_LAYER = 2;
static final int APPLICATION_LAYER = 2;
@@ -327,8 +331,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Nothing to see here, move along...
int mFancyRotationAnimation;
// Enable 3D recents based on config settings.
private Boolean mUse3dRecents;
// What we do when the user long presses on home
private int mLongPressOnHomeBehavior = -1;
ShortcutManager mShortcutManager;
PowerManager.WakeLock mBroadcastWakeLock;
@@ -565,8 +569,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
* the user lets go of the home key
*/
mHomePressed = false;
performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);
sendCloseSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS);
showRecentAppsDialog();
}
};
@@ -576,16 +578,32 @@ public class PhoneWindowManager implements WindowManagerPolicy {
*/
void showRecentAppsDialog() {
// We can't initialize this in init() since the configuration hasn't been loaded yet.
if (mUse3dRecents == null) {
mUse3dRecents = mContext.getResources().getBoolean(R.bool.config_enableRecentApps3D);
if (mLongPressOnHomeBehavior < 0) {
mLongPressOnHomeBehavior
= mContext.getResources().getInteger(R.integer.config_longPressOnPowerBehavior);
if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING ||
mLongPressOnHomeBehavior > LONG_PRESS_HOME_RECENT_ACTIVITY) {
mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;
}
}
if (mLongPressOnHomeBehavior != LONG_PRESS_HOME_NOTHING) {
performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);
sendCloseSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS);
}
// Use 3d Recents dialog
if (mUse3dRecents) {
if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_DIALOG) {
// Fallback to dialog if we fail to launch the above.
if (mRecentAppsDialog == null) {
mRecentAppsDialog = new RecentApplicationsDialog(mContext);
}
mRecentAppsDialog.show();
} else if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_ACTIVITY) {
try {
Intent intent = new Intent();
intent.setClassName("com.android.systemui",
"com.android.systemui.statusbar.RecentApplicationsActivity");
"com.android.systemui.recent.RecentApplicationsActivity");
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
mContext.startActivity(intent);
@@ -594,12 +612,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
Log.e(TAG, "Failed to launch RecentAppsIntent", e);
}
}
// Fallback to dialog if we fail to launch the above.
if (mRecentAppsDialog == null) {
mRecentAppsDialog = new RecentApplicationsDialog(mContext);
}
mRecentAppsDialog.show();
}
/** {@inheritDoc} */