Merge "Add plumbing for Recent Apps keycode" (a1deeba3) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+2 −3

Original line number	Diff line number	Diff line
		@@ -535,12 +535,11 @@

		<!-- Control the behavior when the user long presses the home button.
		0 - Nothing
		1 - Recent apps dialog
		2 - Recent apps view in SystemUI
		1 - Recent apps view in SystemUI
		This needs to match the constants in
		policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
		-->
		<integer name="config_longPressOnHomeBehavior">2</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 control points as follows:

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

+17 −10

Original line number	Diff line number	Diff line
		@@ -179,8 +179,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// These need to match the documentation/constant in
		// core/res/res/values/config.xml
		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_RECENT_SYSTEM_UI = 1;

		static final int APPLICATION_MEDIA_SUBLAYER = -2;
		static final int APPLICATION_MEDIA_OVERLAY_SUBLAYER = -1;
		@@ -782,11 +781,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		// Eat the longpress so it won't dismiss the recent apps dialog when
		// the user lets go of the home key
		mHomeLongPressed = true;
		}

		if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_DIALOG) {
		showOrHideRecentAppsDialog(RECENT_APPS_BEHAVIOR_SHOW_OR_DISMISS);
		} else if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_SYSTEM_UI) {
		try {
		IStatusBarService statusbar = getStatusBarService();
		if (statusbar != null) {
		@@ -1842,7 +1836,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mHomePressed = false;
		mHomeLongPressed = false;
		if (!homeWasLongPressed) {
		if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_SYSTEM_UI) {
		if (mLongPressOnHomeBehavior != LONG_PRESS_HOME_NOTHING) {
		try {
		IStatusBarService statusbar = getStatusBarService();
		if (statusbar != null) {
		@@ -1964,8 +1958,21 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		return 0;
		} else if (keyCode == KeyEvent.KEYCODE_APP_SWITCH) {
		if (down && repeatCount == 0 && !keyguardOn) {
		showOrHideRecentAppsDialog(RECENT_APPS_BEHAVIOR_SHOW_OR_DISMISS);
		if (!keyguardOn) {
		try {
		IStatusBarService statusbar = getStatusBarService();
		if (statusbar != null) {
		if (down && repeatCount == 0) {
		statusbar.preloadRecentApps();
		} else if (!down) {
		statusbar.toggleRecentApps();
		}
		}
		} catch (RemoteException e) {
		Slog.e(TAG, "RemoteException when preloading recent apps", e);
		// re-acquire status bar service next time it is needed.
		mStatusBarService = null;
		}
		}
		return -1;
		} else if (keyCode == KeyEvent.KEYCODE_ASSIST) {