Merge branch 'LawnchairLauncher:14-dev' into trunk

Goooler · Jul 25, 2024 · 755c0a0 · 755c0a0
2 parents 7b12a67 + 60e6d50
commit 755c0a0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -351,11 +351,11 @@ dependencies {
     implementation "androidx.compose.material:material"
     implementation "androidx.compose.runtime:runtime-livedata"
     implementation 'androidx.compose.material3:material3:1.3.0-beta04'
-    implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-beta04'
+    implementation 'androidx.compose.material3:material3-window-size-class:1.3.0-beta05'
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.activity:activity-compose:1.9.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.3"
-    implementation "androidx.navigation:navigation-compose:2.8.0-beta05"
+    implementation "androidx.activity:activity-compose:1.9.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4"
+    implementation "androidx.navigation:navigation-compose:2.8.0-beta06"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.slice:slice-core:1.1.0-alpha02"
     def accompanistVersion = '0.34.0'

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -564,7 +564,11 @@ public void onUserUnlocked() {
                     mTaskAnimationManager, mTaskbarManager::getCurrentActivityContext);
         }
         mInputConsumer = InputConsumerController.getRecentsAnimationInputConsumer();
-        mInputConsumer.registerInputConsumer();
+        try {
+            mInputConsumer.registerInputConsumer();
+        } catch (Exception e) {
+            Log.e(TAG, "Failure registering InputConsumer", e);
+        }
         onSystemUiFlagsChanged(mDeviceState.getSystemUiStateFlags());
         onAssistantVisibilityChanged();
 

diff --git a/settings.gradle b/settings.gradle
@@ -13,7 +13,7 @@ pluginManagement {
 
 // https://docs.gradle.com/enterprise/gradle-plugin/
 plugins {
-    id "com.gradle.develocity" version "3.17.5"
+    id "com.gradle.develocity" version "3.17.6"
 }
 
 def isCI = providers.environmentVariable('CI').present

diff --git a/systemUnFold/build.gradle b/systemUnFold/build.gradle
@@ -40,6 +40,6 @@ dependencies {
     ksp "com.google.dagger:hilt-compiler:$daggerVersion"
 
     implementation "androidx.concurrent:concurrent-futures:1.2.0"
-    implementation "androidx.lifecycle:lifecycle-common:2.8.3"
+    implementation "androidx.lifecycle:lifecycle-common:2.8.4"
     implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
 }