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

Merge "Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"" into nyc-dev

Browse Source
This commit is contained in:
Jaewan Kim
2016-02-16 17:11:57 +00:00
committed by Android (Google) Code Review
parent 82a6017fc5 76b7d0d5d7
commit c3e78d5e62
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -998,7 +998,6 @@
0 - Nothing
1 - Recent apps view in SystemUI
2 - Launch assist intent
3 - Start picture-in-picture (PIP) or launch PIP UI
This needs to match the constants in
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
-->

12
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -190,8 +190,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
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 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
}
private void handleLongPressOnHome(int deviceId, KeyEvent event) {
private void handleLongPressOnHome(int deviceId) {
if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_NOTHING) {
return;
}
@@ -1364,11 +1363,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
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 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
} else if ((event.getFlags() & KeyEvent.FLAG_LONG_PRESS) != 0) {
if (!keyguardOn) {
handleLongPressOnHome(event.getDeviceId(), event);
handleLongPressOnHome(event.getDeviceId());
}
}
return -1;