Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"
Long press HOME will launch recents instead.
Bug: 27159966
Change-Id: I9a4fd847d716d7e4e4754c7a9c48628c46f82233
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 3a70e67..6c2e4d4 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -190,8 +190,7 @@
static final int LONG_PRESS_HOME_NOTHING = 0;
static final int LONG_PRESS_HOME_RECENT_SYSTEM_UI = 1;
static final int LONG_PRESS_HOME_ASSIST = 2;
- static final int LONG_PRESS_HOME_PICTURE_IN_PICTURE = 3;
- static final int LAST_LONG_PRESS_HOME_BEHAVIOR = LONG_PRESS_HOME_PICTURE_IN_PICTURE;
+ static final int LAST_LONG_PRESS_HOME_BEHAVIOR = LONG_PRESS_HOME_ASSIST;
static final int DOUBLE_TAP_HOME_NOTHING = 0;
static final int DOUBLE_TAP_HOME_RECENT_SYSTEM_UI = 1;
@@ -1350,7 +1349,7 @@
}
}
- private void handleLongPressOnHome(int deviceId, KeyEvent event) {
+ private void handleLongPressOnHome(int deviceId) {
if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_NOTHING) {
return;
}
@@ -1364,11 +1363,8 @@
case LONG_PRESS_HOME_ASSIST:
launchAssistAction(null, deviceId);
break;
- case LONG_PRESS_HOME_PICTURE_IN_PICTURE:
- requestTvPictureInPicture(event);
- break;
default:
- Log.w(TAG, "Not defined home long press behavior: " + mLongPressOnHomeBehavior);
+ Log.w(TAG, "Undefined home long press behavior: " + mLongPressOnHomeBehavior);
break;
}
}
@@ -2940,7 +2936,7 @@
}
} else if ((event.getFlags() & KeyEvent.FLAG_LONG_PRESS) != 0) {
if (!keyguardOn) {
- handleLongPressOnHome(event.getDeviceId(), event);
+ handleLongPressOnHome(event.getDeviceId());
}
}
return -1;