Merge "Remove unnecessary method from StatefulActivity" into udc-qpr-dev
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 512d5f4..a5ba815 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -1305,11 +1305,9 @@
: groupTask.mSplitBounds.leftTaskPercent);
}
- @Override
public boolean isCommandQueueEmpty() {
OverviewCommandHelper overviewCommandHelper = mTISBindHelper.getOverviewCommandHelper();
- return super.isCommandQueueEmpty()
- && (overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty());
+ return overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty();
}
private static final class LauncherTaskViewController extends
diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index e282d1f..8a9c3c8 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -467,10 +467,8 @@
};
}
- @Override
public boolean isCommandQueueEmpty() {
OverviewCommandHelper overviewCommandHelper = mTISBindHelper.getOverviewCommandHelper();
- return super.isCommandQueueEmpty()
- && (overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty());
+ return overviewCommandHelper == null || overviewCommandHelper.isCommandQueueEmpty();
}
}
diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
index a9a57c6..7dc8347 100644
--- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
+++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java
@@ -86,7 +86,7 @@
}
@Override
- public boolean isCommandQueueEmpty() {
+ protected boolean isCommandQueueEmpty() {
return mActivity.isCommandQueueEmpty();
}
diff --git a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
index 9e9b22f..3ee9009 100644
--- a/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/LauncherRecentsView.java
@@ -90,7 +90,7 @@
}
@Override
- public boolean isCommandQueueEmpty() {
+ protected boolean isCommandQueueEmpty() {
return mActivity.isCommandQueueEmpty();
}
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index f0daf8d..421a48c 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2374,7 +2374,7 @@
protected abstract void handleStartHome(boolean animated);
/** Returns whether the overview command helper queue is empty. */
- public abstract boolean isCommandQueueEmpty();
+ protected abstract boolean isCommandQueueEmpty();
public void reset() {
setCurrentTask(-1);
diff --git a/src/com/android/launcher3/statemanager/StatefulActivity.java b/src/com/android/launcher3/statemanager/StatefulActivity.java
index de5887f..520f33c 100644
--- a/src/com/android/launcher3/statemanager/StatefulActivity.java
+++ b/src/com/android/launcher3/statemanager/StatefulActivity.java
@@ -237,10 +237,4 @@
* @param leftOrTop if the staged split will be positioned left or top.
*/
public void enterStageSplitFromRunningApp(boolean leftOrTop) { }
-
-
- /** Returns whether the overview command helper queue is empty. */
- public boolean isCommandQueueEmpty() {
- return true;
- }
}