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

Merge "Ignore signals from RecentTasks for frozen task list" into rvc-dev

Browse Source
This commit is contained in:
Vinit Nayak
2020-05-21 20:59:25 +00:00
committed by Android (Google) Code Review
parent 3ce785b6e5 bbf37a124f
commit 83315682fc
2 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
View File

@@ -113,16 +113,6 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
} }
}; };
private TaskStackChangeListener mTaskStackChangeListener = new TaskStackChangeListener() {
@Override
public void onRecentTaskListFrozenChanged(boolean frozen) {
if (!frozen) {
mStartingQuickstepRotation = -1;
mDisabledForQuickstep = false;
}
}
};
private final ContentObserver mFixedRotationObserver = new ContentObserver( private final ContentObserver mFixedRotationObserver = new ContentObserver(
new Handler(Looper.getMainLooper())) { new Handler(Looper.getMainLooper())) {
@Override @Override
@@ -287,12 +277,8 @@ public class EdgeBackGestureHandler extends CurrentUserTracker implements Displa
private void setRotationCallbacks(boolean enable) { private void setRotationCallbacks(boolean enable) {
if (enable) { if (enable) {
ActivityManagerWrapper.getInstance().registerTaskStackListener(
mTaskStackChangeListener);
mOverviewProxyService.addCallback(mQuickSwitchListener); mOverviewProxyService.addCallback(mQuickSwitchListener);
} else { } else {
ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
mTaskStackChangeListener);
mOverviewProxyService.removeCallback(mQuickSwitchListener); mOverviewProxyService.removeCallback(mQuickSwitchListener);
} }
} }

12
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
View File

@@ -305,14 +305,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
} }
}; };
private TaskStackChangeListener mTasksFrozenListener = new TaskStackChangeListener() {
@Override
public void onRecentTaskListFrozenChanged(boolean frozen) {
mFrozenTasks = frozen;
orientSecondaryHomeHandle();
}
};
private NavigationBarTransitions.DarkIntensityListener mOrientationHandleIntensityListener = private NavigationBarTransitions.DarkIntensityListener mOrientationHandleIntensityListener =
new NavigationBarTransitions.DarkIntensityListener() { new NavigationBarTransitions.DarkIntensityListener() {
@Override @Override
@@ -510,7 +502,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
} }
initSecondaryHomeHandleForRotation(); initSecondaryHomeHandleForRotation();
ActivityManagerWrapper.getInstance().registerTaskStackListener(mTasksFrozenListener);
} }
@Override @Override
@@ -527,7 +518,6 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
} }
mOverviewProxyService.removeCallback(mOverviewProxyListener); mOverviewProxyService.removeCallback(mOverviewProxyListener);
mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver); mBroadcastDispatcher.unregisterReceiver(mBroadcastReceiver);
ActivityManagerWrapper.getInstance().unregisterTaskStackListener(mTasksFrozenListener);
if (mOrientationHandle != null) { if (mOrientationHandle != null) {
resetSecondaryHandle(); resetSecondaryHandle();
getContext().getSystemService(DisplayManager.class).unregisterDisplayListener(this); getContext().getSystemService(DisplayManager.class).unregisterDisplayListener(this);
@@ -594,7 +584,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
return; return;
} }
if (!mFrozenTasks) { if (mStartingQuickSwitchRotation == -1) {
resetSecondaryHandle(); resetSecondaryHandle();
} else { } else {
int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation); int deltaRotation = deltaRotation(mCurrentRotation, mStartingQuickSwitchRotation);