commit acbe9f6546455672b2edf51928d4fee4b6e246ba
author Robert Kozikowski <robertkoz@google.com> Wed Feb 04 18:38:30 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 04 18:38:31 2015 +0000
tree 6bba6e6cf45d740d135c516b0ee7960329688147
parent 4802b4107a66bc86996083b4835d1094ef4f4cbb
parent 42f3b9e0283c30c40c286f9958ce0f8b02f85c52

Merge "Adding Launcher3 callbacks for trimming memory." into ub-launcher3-almonte

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5d8e136..591eb64 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3791,6 +3791,9 @@
             if (mAppsCustomizeTabHost != null) {
                 mAppsCustomizeTabHost.trimMemory();
             }
+            if (mLauncherCallbacks != null) {
+                mLauncherCallbacks.onTrimMemory(level);
+            }
         }
     }
 

src/com/android/launcher3/LauncherCallbacks.java

diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index a1f4e0b..d8128d6 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -42,6 +42,7 @@
     public void dump(String prefix, FileDescriptor fd, PrintWriter w, String[] args);
     public void onHomeIntent();
     public boolean handleBackPressed();
+    public void onTrimMemory(int level);
 
     /*
      * Extension points for providing custom behavior on certain user interactions.

src/com/android/launcher3/LauncherExtension.java

diff --git a/src/com/android/launcher3/LauncherExtension.java b/src/com/android/launcher3/LauncherExtension.java
index b264042..fe9bd6c 100644
--- a/src/com/android/launcher3/LauncherExtension.java
+++ b/src/com/android/launcher3/LauncherExtension.java
@@ -108,6 +108,10 @@
         }
 
         @Override
+        public void onTrimMemory(int level) {
+        }
+
+        @Override
         public void onLauncherProviderChange() {
         }