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

Merge "Cancels out long press on recents button when viewing home screen"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-12-09 19:44:37 +00:00
committed by Android (Google) Code Review
parent bebbf70e2f 0d22b079c5
commit ca029c2d13
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -146,10 +146,12 @@ import com.android.systemui.plugins.qs.QS.ActivityStarter;
import com.android.systemui.plugins.qs.QS.BaseStatusBarHeader;
import com.android.systemui.qs.QSFragment;
import com.android.systemui.qs.QSPanel;
import com.android.systemui.recents.Recents;
import com.android.systemui.recents.ScreenPinningRequest;
import com.android.systemui.recents.events.EventBus;
import com.android.systemui.recents.events.activity.AppTransitionFinishedEvent;
import com.android.systemui.recents.events.activity.UndockingTaskEvent;
import com.android.systemui.recents.misc.SystemServicesProxy;
import com.android.systemui.stackdivider.Divider;
import com.android.systemui.stackdivider.WindowManagerProxy;
import com.android.systemui.statusbar.ActivatableNotificationView;
@@ -1362,6 +1364,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
return false;
}
ActivityManager.RunningTaskInfo runningTask =
Recents.getSystemServices().getRunningTask();
boolean isRunningTaskInHomeOrRecentsStack = runningTask != null &&
ActivityManager.StackId.isHomeOrRecentsStack(runningTask.stackId);
if (isRunningTaskInHomeOrRecentsStack) {
return false;
}
toggleSplitScreenMode(MetricsEvent.ACTION_WINDOW_DOCK_LONGPRESS,
MetricsEvent.ACTION_WINDOW_UNDOCK_LONGPRESS);
return true;