Commit: 7a5d3a11b5715bc217a4a066c64c9dd6bc11c61c - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: 7a5d3a11b5715bc217a4a066c64c9dd6bc11c61c (tree)
• Time: 2020-07-11 16:25:30
• Author: utzcoz <utzcoz@outl...>
• Commiter: utzcoz

Log Message

Use systemui recents as default pc recents

1. Enable grid layout of systemui recents.
2. Disable OverviewProxyService to use systemui recents, instead of

recents that implements OverviewProxyService such as Launcher3.

3. Show freeform task in systemui recents.
4. Fix IndexOutArrayException of systemui recents grid layout when

starting many freeform tasks.

Signed-off-by: utzcoz <[e-mail]>

Change Summary

• modified: packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/TaskStack.java
• modified: packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
• modified: packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
• modified: packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java

Incremental Difference

--- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/TaskStack.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/TaskStack.java
@@ -67,7 +67,10 @@ public class TaskStack {
 
     public TaskStack() {
         // Ensure that we only show stack tasks
-        mStackTaskList.setFilter((taskIdMap, t, index) -> t.isStackTask);
+        // region @boringdroid
+        // We want the recents to show freeform stack too, so we remove the filter.
+        // mStackTaskList.setFilter((taskIdMap, t, index) -> t.isStackTask);
+        // endregion
     }
 
     /** Sets the callbacks for this task stack. */

--- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
+++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java
@@ -383,9 +383,15 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
     }
 
     private void updateEnabledState() {
+        // region @boringdroid
+        // Before there is an ideal overview implementation, we will disable the
+        // overview proxy service.
+        /*
         mIsEnabled = mContext.getPackageManager().resolveServiceAsUser(mQuickStepIntent,
                 MATCH_DIRECT_BOOT_UNAWARE,
                 ActivityManagerWrapper.getInstance().getCurrentUserId()) != null;
+        */
+        // endregion
     }
 
     @Override

--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java
@@ -91,7 +91,11 @@ public class RecentsConfiguration {
         Resources res = mAppContext.getResources();
         fakeShadows = res.getBoolean(R.bool.config_recents_fake_shadows);
         svelteLevel = res.getInteger(R.integer.recents_svelte_level);
-        isGridEnabled = SystemProperties.getBoolean("ro.recents.grid", false);
+        // region @boringdroid
+        // Enable grid recents default.
+        // isGridEnabled = SystemProperties.getBoolean("ro.recents.grid", false);
+        isGridEnabled = SystemProperties.getBoolean("ro.recents.grid", true);
+        // endregion
         isLowRamDevice = ActivityManager.isLowRamDeviceStatic();
         dragToSplitEnabled = !isLowRamDevice;
 

--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -351,6 +351,17 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
 
         // Only notify if we are already initialized, otherwise, everything will pick up all the
         // new and old tasks when we next layout
+        // region @boringdroid
+        if (useGridLayout()
+                && stack.getTaskCount() > TaskGridLayoutAlgorithm.MAX_LAYOUT_TASK_COUNT) {
+            int toIndex = stack.getTaskCount();
+            int fromIndex = toIndex - TaskGridLayoutAlgorithm.MAX_LAYOUT_TASK_COUNT;
+            stack.setTasks(
+                    stack.getTasks().subList(fromIndex, toIndex),
+                    allowNotifyStackChanges && isInitialized
+            );
+        }
+        // endregion
         mStack.setTasks(stack, allowNotifyStackChanges && isInitialized);
     }