Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix NPE in DepthController #3371

Merged
merged 6 commits into from Mar 17, 2023
Merged

Fix NPE in DepthController #3371

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03c693a
Fix NPE in MainThreadInitializedObject#get
Goooler Mar 13, 2023
0d910f7
Fix
Goooler Mar 13, 2023
2384ed4
Revert "Fix"
Goooler Mar 17, 2023
68c61f7
Revert "Fix NPE in MainThreadInitializedObject#get"
Goooler Mar 17, 2023
23649ac
Use app context in DepthController
Goooler Mar 17, 2023
f3839f1
Comment
Goooler Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion quickstep/src/com/android/launcher3/statehandlers/DepthController.java
View file
Open in desktop
Expand Up @@ -48,6 +48,7 @@
import com.patrykmichalik.opto.domain.Preference;
import com.patrykmichalik.opto.core.PreferenceExtensionsKt;

import app.lawnchair.LawnchairApp;
import app.lawnchair.preferences.BasePreferenceManager;
import app.lawnchair.preferences.PreferenceManager;
import app.lawnchair.preferences2.PreferenceManager2;
Expand Down Expand Up @@ -174,7 +175,9 @@ public void run() {

public DepthController(Launcher l) {
mLauncher = l;
Preference<Boolean, Boolean, ?> depthPref = PreferenceManager2.getInstance(l).getWallpaperDepthEffect();
// TODO: No need to use app context here after merging Android 13 branch.
// https://cs.android.com/android/platform/superproject/+/master:packages/apps/Launcher3/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java;drc=eef0b1640bbc8c26c824836271a71b929726e895;l=175
Preference<Boolean, Boolean, ?> depthPref = PreferenceManager2.getInstance(LawnchairApp.getInstance()).getWallpaperDepthEffect();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Android 12.1:

lawnchair/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java

Line 103 in 4a3ce2b

private DepthController mDepthController = new DepthController(this);

Android 13: https://cs.android.com/android/platform/superproject/+/master:packages/apps/Launcher3/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java;drc=eef0b1640bbc8c26c824836271a71b929726e895;l=175

mEnableDepth = PreferenceExtensionsKt.firstBlocking(depthPref);
}

Expand Down