commit bd4a78937ffe2f37386dae4ae8817e33422c1267
author Adam Cohen <adamcohen@google.com> Fri Feb 06 23:29:32 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 06 23:29:32 2015 +0000
tree 21ddf3337c63fad78906f940061f36f234557db3
parent acbe9f6546455672b2edf51928d4fee4b6e246ba
parent e2d4ee1b21014e0f644134bd7c56291078b1ed60

Merge "Revert "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 591eb64..5d8e136 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3791,9 +3791,6 @@
             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 d8128d6..a1f4e0b 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -42,7 +42,6 @@
     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 fe9bd6c..b264042 100644
--- a/src/com/android/launcher3/LauncherExtension.java
+++ b/src/com/android/launcher3/LauncherExtension.java
@@ -108,10 +108,6 @@
         }
 
         @Override
-        public void onTrimMemory(int level) {
-        }
-
-        @Override
         public void onLauncherProviderChange() {
         }