From: Sunny Goyal <sunnygoyal@google.com>
Date: Fri, 11 Dec 2015 22:18:16 +0000 (-0800)
Subject: resolve merge conflicts of a50a419b82 to ub-launcher3-master.
X-Git-Tag: android-x86-7.1-r1~595
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=38e7f28d3faa04fa0bc0f15e78f59a2b1ed123a3;p=android-x86%2Fpackages-apps-Launcher3.git

resolve merge conflicts of a50a419b82 to ub-launcher3-

Change-Id: Ie0e233e22284b8ddd2dbb86204e042651b6dfae2
---

38e7f28d3faa04fa0bc0f15e78f59a2b1ed123a3
diff --cc src/com/android/launcher3/LauncherAppState.java
index 0a26109c9,430d19342..ad959ef8c
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@@ -108,16 -105,7 +109,16 @@@ public class LauncherAppState 
  
          sContext.registerReceiver(mModel, filter);
          UserManagerCompat.getInstance(sContext).enableAndResetCache();
- 
 +        if (!Utilities.ATLEAST_KITKAT) {
 +            sContext.registerReceiver(new BroadcastReceiver() {
 +
 +                @Override
 +                public void onReceive(Context context, Intent intent) {
 +                    mWallpaperChangedSinceLastCheck = true;
 +                }
 +            }, new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED));
 +        }
+         new ConfigMonitor(sContext).register();
      }
  
      /**