Merge "Add dialog to set Default Wallpaper on lock screen for N+." into ub-launcher3-burnaby-nyc
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 990bde0..918ae52 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -127,13 +127,6 @@
android:process=":settings_process">
</activity>
- <receiver
- android:name="com.android.launcher3.WallpaperChangedReceiver">
- <intent-filter>
- <action android:name="android.intent.action.WALLPAPER_CHANGED" />
- </intent-filter>
- </receiver>
-
<!-- Intent received used to install shortcuts from other applications -->
<receiver
android:name="com.android.launcher3.InstallShortcutReceiver"
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 1f7bbe0..e1ade10 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -106,6 +106,9 @@
sContext.registerReceiver(mModel, filter);
UserManagerCompat.getInstance(sContext).enableAndResetCache();
new ConfigMonitor(sContext).register();
+
+ sContext.registerReceiver(
+ new WallpaperChangedReceiver(), new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED));
}
/**