diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:57:09 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-15 14:57:09 -0800 |
| commit | 9b03281afe4420820cfa583e468aaeca7d63b835 (patch) | |
| tree | 7f3a811083027647edb003c3f3f7418b41fce636 | |
| parent | ed1816e3a828046439da5cb31a65af4641be9076 (diff) | |
| download | android_packages_apps_Trebuchet-9b03281afe4420820cfa583e468aaeca7d63b835.tar.gz android_packages_apps_Trebuchet-9b03281afe4420820cfa583e468aaeca7d63b835.tar.bz2 android_packages_apps_Trebuchet-9b03281afe4420820cfa583e468aaeca7d63b835.zip | |
trebuchet: Avoid NPE on startup
The workspaces are now inflated before the LauncherView, so defer
wallpaper initialization until later.
Change-Id: I8b939ec217e73b4a7c2b14434479982e24315c74
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/Launcher.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java index c69ec47be..320b86936 100644 --- a/src/com/cyanogenmod/trebuchet/Launcher.java +++ b/src/com/cyanogenmod/trebuchet/Launcher.java @@ -2506,8 +2506,10 @@ public final class Launcher extends Activity } private void setWorkspaceBackground(boolean workspace) { - mLauncherView.setBackground(workspace ? - mWorkspaceBackgroundDrawable : mBlackBackgroundDrawable); + if (mLauncherView != null) { + mLauncherView.setBackground(workspace ? + mWorkspaceBackgroundDrawable : mBlackBackgroundDrawable); + } } void updateWallpaperVisibility(boolean visible) { |