build: Snapshot 10 (Draft)

GITHUB_CHANGELOG.md

@@ -6,11 +6,13 @@
 
 Bug fixes only
 
-Build: BS10.2011
+Build: BS10.2111 (latest), BS10.2011
 
 This is a developer-focused change log:
 * Fix a lot of internal basic functionality
 * Re-added some Lawnchair-specific code
+* Fix workspace navigation
+* Fix allapps navigation
 
 ### 🥞 Snapshot 9 (Development 4 Release 1)
 

quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java

@@ -15,6 +15,7 @@
  */
 package com.android.launcher3.model;
 
+import static android.Manifest.permission.PACKAGE_USAGE_STATS;
 import static android.text.format.DateUtils.DAY_IN_MILLIS;
 import static android.text.format.DateUtils.formatElapsedTime;
 
@@ -308,7 +309,7 @@ public class QuickstepModelDelegate extends ModelDelegate {
             return;
         }
 
-        int usagePerm = mContext.checkCallingOrSelfPermission(Manifest.permission.PACKAGE_USAGE_STATS);
+        int usagePerm = mContext.checkCallingOrSelfPermission(PACKAGE_USAGE_STATS);
         if (usagePerm != PackageManager.PERMISSION_GRANTED)
             return;
 
@@ -337,6 +338,13 @@ public class QuickstepModelDelegate extends ModelDelegate {
     @WorkerThread
     private void recreateHotseatPredictor() {
         mHotseatPredictionState.destroyPredictor();
+        
+        AppPredictionManager apm = mContext.getSystemService(AppPredictionManager.class);
+        if (apm == null) return;
+        
+        int usagePerm = mContext.checkCallingOrSelfPermission(PACKAGE_USAGE_STATS);
+        if (usagePerm != PackageManager.PERMISSION_GRANTED) return;
+        
         if (mActive) {
             registerHotseatPredictor(mContext);
         }

quickstep/src/com/android/quickstep/util/BaseDepthController.java

@@ -313,7 +313,7 @@ public class BaseDepthController {
         Log.d(TAG, "setEarlyWakeup: " + start);
         if (start) {
 //            Trace.instantForTrack(TRACE_TAG_APP, TAG, "notifyRendererForGpuLoadUp");
-            mLauncher.getRootView().getViewRootImpl().notifyRendererForGpuLoadUp("applyBlur");
+//            mLauncher.getRootView().getViewRootImpl().notifyRendererForGpuLoadUp("applyBlur");
 //            transaction.setEarlyWakeupStart();
         } else {
 //            transaction.setEarlyWakeupEnd();

src/com/android/launcher3/CheckLongPressHelper.java

@@ -141,8 +141,15 @@ public class CheckLongPressHelper {
     }
 
     private void triggerLongPress() {
+        boolean showHomeBehindDesktop;
+        if (false) {
+            // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17
+            showHomeBehindDesktop = Flags.showHomeBehindDesktop();
+        } else {
+            showHomeBehindDesktop = false;
+        }
         if ((mView.getParent() != null)
-                && (Flags.showHomeBehindDesktop() || mView.hasWindowFocus())
+                && (showHomeBehindDesktop || mView.hasWindowFocus())
                 && (!mView.isPressed() || mListener != null)
                 && !mHasPerformedLongPress) {
             boolean handled;

wmshell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopStateImpl.kt

@@ -90,14 +90,19 @@ class DesktopStateImpl(context: Context) : DesktopState {
         } && isDeviceEligibleForDesktopExperienceDevOption
 
     override val enterDesktopByDefaultOnFreeformDisplay: Boolean =
-        DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue ||
-        DesktopExperienceFlags.ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS.isTrue &&
-            SystemProperties.getBoolean(
-                ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAY_SYS_PROP,
-                context
-                    .getResources()
-                    .getBoolean(R.bool.config_enterDesktopByDefaultOnFreeformDisplay),
-            )
+        if (false) {
+            // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17
+            DesktopExperienceFlags.ENABLE_DESKTOP_FIRST_BASED_DEFAULT_TO_DESKTOP_BUGFIX.isTrue ||
+            DesktopExperienceFlags.ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAYS.isTrue &&
+                SystemProperties.getBoolean(
+                    ENTER_DESKTOP_BY_DEFAULT_ON_FREEFORM_DISPLAY_SYS_PROP,
+                    context
+                        .getResources()
+                        .getBoolean(R.bool.config_enterDesktopByDefaultOnFreeformDisplay),
+                )
+        } else {
+            false
+        }
 
     override val isDeviceEligibleForDesktopMode: Boolean
         get() {
@@ -159,8 +164,13 @@ class DesktopStateImpl(context: Context) : DesktopState {
             } ?: false
 
     override val overridesShowAppHandle: Boolean =
-        (Flags.showAppHandleLargeScreens() ||
-            BubbleAnythingFlagHelper.enableBubbleToFullscreen()) && deviceHasLargeScreen
+        if (false) {
+            // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17
+            (Flags.showAppHandleLargeScreens() ||
+                BubbleAnythingFlagHelper.enableBubbleToFullscreen()) && deviceHasLargeScreen
+        } else {
+            false
+        }
 
     private val hasFreeformFeature =
         context.getPackageManager().hasSystemFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT)
@@ -173,9 +183,14 @@ class DesktopStateImpl(context: Context) : DesktopState {
     override val isFreeformEnabled: Boolean = hasFreeformFeature || hasFreeformDevOption
 
     override val shouldShowHomeBehindDesktop: Boolean =
-        Flags.showHomeBehindDesktop() && context.resources.getBoolean(
-            R.bool.config_showHomeBehindDesktop
-        )
+        if (false) {
+            // LC-Ignored: Lawnchair-TODO: Intentional unless we can find a way to detect QPR1 build or skip to Android 17
+            Flags.showHomeBehindDesktop() && context.resources.getBoolean(
+                R.bool.config_showHomeBehindDesktop
+            )
+        } else {
+            false
+        }
 
     companion object {
         @VisibleForTesting