Fix more crashes below Android 10

This commit is contained in:
Suphon Thanakornpakapong
2021-05-31 10:47:43 +07:00
parent 7c26603f33
commit 61d2358ba1
8 changed files with 30 additions and 17 deletions

View File

@@ -37,6 +37,8 @@ import java.util.Collections;
import java.util.List;
import java.util.function.Consumer;
import app.lawnchair.LawnchairApp;
/**
* Manages the recent task list from the system, caching it as necessary.
*/
@@ -61,7 +63,9 @@ public class RecentTasksList extends TaskStackChangeListener {
mKeyguardManager = keyguardManager;
mChangeId = 1;
mActivityManagerWrapper = activityManagerWrapper;
mActivityManagerWrapper.registerTaskStackListener(this);
if (LawnchairApp.isRecentsEnabled()) {
mActivityManagerWrapper.registerTaskStackListener(this);
}
}
/**

View File

@@ -42,6 +42,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import app.lawnchair.LawnchairApp;
/**
* Singleton class to load and manage recents model.
*/
@@ -68,7 +70,9 @@ public class RecentsModel extends TaskStackChangeListener {
mIconCache = new TaskIconCache(context, looper);
mThumbnailCache = new TaskThumbnailCache(context, looper);
ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
if (LawnchairApp.isRecentsEnabled()) {
ActivityManagerWrapper.getInstance().registerTaskStackListener(this);
}
IconProvider.registerIconChangeListener(context,
this::onPackageIconChanged, MAIN_EXECUTOR.getHandler());
}

View File

@@ -27,6 +27,7 @@ import android.content.Intent;
import android.content.res.Resources;
import android.util.Log;
import com.android.launcher3.Utilities;
import com.android.launcher3.logging.StatsLogManager.LauncherEvent;
import com.android.launcher3.touch.PagedOrientationHandler;
import com.android.launcher3.util.MainThreadInitializedObject;
@@ -84,6 +85,10 @@ public class SysUINavigationMode {
updateMode();
}
}, getPackageFilter("android", ACTION_OVERLAY_CHANGED));
if (!Utilities.ATLEAST_Q) {
mMode = Mode.THREE_BUTTONS;
}
}
/** Updates navigation mode when needed. */