diff --git a/build.gradle b/build.gradle index 69dc6029f8..37546eba26 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'com.android.application' version "8.12.0" - id 'com.android.library' version "8.12.0" apply false + id 'com.android.application' version '8.12.0' + id 'com.android.library' version '8.12.0' apply false id 'com.android.test' version '8.12.0' apply false id 'androidx.baselineprofile' version '1.4.0' id 'org.jetbrains.kotlin.android' version "2.2.0" @@ -52,7 +52,7 @@ allprojects { } } dependencies { - implementation 'androidx.core:core-ktx:1.17.0-beta01' + implementation 'androidx.core:core-ktx:1.17.0-rc01' } } @@ -407,7 +407,7 @@ dependencies { implementation "androidx.graphics:graphics-core:1.0.3" implementation "androidx.graphics:graphics-path:1.0.1" - implementation "androidx.graphics:graphics-shapes:1.1.0-alpha01" + implementation "androidx.graphics:graphics-shapes:1.1.0-beta01" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2' implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0' @@ -428,10 +428,10 @@ dependencies { implementation "androidx.compose.ui:ui-text-google-fonts:1.8.3" implementation "androidx.compose.foundation:foundation:1.8.3" implementation "androidx.compose.material:material-icons-extended" - implementation "androidx.compose.material:material:1.9.0-beta03" - implementation "androidx.compose.runtime:runtime-livedata:1.9.0-beta03" - implementation 'androidx.compose.material3:material3:1.4.0-alpha18' - implementation 'androidx.compose.material3:material3-window-size-class:1.4.0-alpha18' + implementation "androidx.compose.material:material:1.9.0-rc01" + implementation "androidx.compose.runtime:runtime-livedata:1.9.0-rc01" + implementation 'androidx.compose.material3:material3:1.4.0-beta01' + implementation 'androidx.compose.material3:material3-window-size-class:1.4.0-beta01' implementation "androidx.activity:activity-compose:1.10.1" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.9.2" implementation "androidx.navigation:navigation-compose:2.9.3" diff --git a/flags/src/com/android/launcher3/CustomFeatureFlags.java b/flags/src/com/android/launcher3/CustomFeatureFlags.java index 5f5d8d3a58..2db6820c48 100644 --- a/flags/src/com/android/launcher3/CustomFeatureFlags.java +++ b/flags/src/com/android/launcher3/CustomFeatureFlags.java @@ -822,7 +822,6 @@ public class CustomFeatureFlags implements FeatureFlags { } private boolean isOptimizationEnabled() { - // LC-TODO: Maybe make it true for r8 return false; } diff --git a/gradle.properties b/gradle.properties index 8755699307..e8adbb7198 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,6 +4,7 @@ android.defaults.buildfeatures.shaders=false android.useAndroidX=true android.enableHiddenApiCheck=false android.hideApiWarning=false +android.nonTransitiveRClass=true # Improve build performance by enabling R8 parallelism. android.r8.maxWorkers=4 diff --git a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt index 0992442169..37a2772a43 100644 --- a/lawnchair/src/app/lawnchair/LawnchairLauncher.kt +++ b/lawnchair/src/app/lawnchair/LawnchairLauncher.kt @@ -493,7 +493,7 @@ class LawnchairLauncher : QuickstepLauncher() { var sRestartFlags = 0 - val instance get() = LauncherAppState.getInstanceNoCreate() + val instance get() = LauncherAppState.getInstanceNoCreate() as? LawnchairLauncher } } diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt index d6b0d33b6b..bbd06be365 100644 --- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt +++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.kt @@ -167,8 +167,7 @@ class DesktopTaskView @JvmOverloads constructor(context: Context, attrs: Attribu cornerRadius = contentViewFullscreenParams.currentCornerRadius backgroundView = findViewById(R.id.background) backgroundView.setBackgroundColor( - // Lawnchair-TODO-Colour: ColorTokens.Neutral2_300.resolveColor(context) - resources.getColor(android.R.color.system_neutral2_300, context.theme) + resources.getColor(ColorTokens.Neutral2_300.resolveColor(context), context.theme) ) } } diff --git a/systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java b/systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java index b981f98377..96030648af 100644 --- a/systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java +++ b/systemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java @@ -18,13 +18,16 @@ package com.android.systemui.shared.system; import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED; import static android.app.ActivityManager.LOCK_TASK_MODE_NONE; +import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE; import static android.app.ActivityTaskManager.getService; +import static app.lawnchair.compat.LawnchairQuickstepCompat.ATLEAST_R; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityClient; import android.app.ActivityManager; +import android.app.ActivityManager.RecentTaskInfo; import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityOptions; import android.app.ActivityTaskManager; @@ -36,6 +39,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.Bundle; +import android.os.DeadSystemException; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; @@ -74,13 +78,17 @@ public class ActivityManagerWrapper { /** * @return the current user's id. */ - public int getCurrentUserId() { + public int getCurrentUserId() throws DeadSystemException { UserInfo ui; try { ui = ActivityManager.getService().getCurrentUser(); return ui != null ? ui.id : 0; } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); + if (ATLEAST_R) { + throw e.rethrowFromSystemServer(); + } else { + throw new DeadSystemException(); + } } }