commit d75bae1e4018aae02927cc0d4de8134650682377
author Winson Chung <winsonc@google.com> Tue Apr 24 21:32:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 21:32:22 2018 +0000
tree ab41e07ec9aeb85de94a1bffc379ec3d8ba93a15
parent 75475dee3ffdc9651adb1429b4747f8c9ef7f745
parent dd8efeb6df3237ec09a98af5de6cdc327a814a03

Merge changes from topic "am-4cd47dfb-69f3-4024-b843-08171239036b" into ub-launcher3-master

* changes:
  [automerger] Send trim memory to trim icon cache when stopped am: dea51350d6
  Send trim memory to trim icon cache when stopped

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e3435f4..1285a2b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1280,7 +1280,7 @@
             }
 
             if (mLauncherCallbacks != null) {
-                mLauncherCallbacks.onHomeIntent();
+                mLauncherCallbacks.onHomeIntent(internalStateHandled);
             }
         }
 

src/com/android/launcher3/LauncherCallbacks.java

diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index 35faaea..6aef658 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -50,7 +50,7 @@
     void onAttachedToWindow();
     void onDetachedFromWindow();
     void dump(String prefix, FileDescriptor fd, PrintWriter w, String[] args);
-    void onHomeIntent();
+    void onHomeIntent(boolean internalStateHandled);
     boolean handleBackPressed();
     void onTrimMemory(int level);