summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2015-02-06 23:29:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-06 23:29:32 +0000
commitbd4a78937ffe2f37386dae4ae8817e33422c1267 (patch)
tree21ddf3337c63fad78906f940061f36f234557db3 /src
parentacbe9f6546455672b2edf51928d4fee4b6e246ba (diff)
parente2d4ee1b21014e0f644134bd7c56291078b1ed60 (diff)
downloadandroid_packages_apps_Trebuchet-bd4a78937ffe2f37386dae4ae8817e33422c1267.tar.gz
android_packages_apps_Trebuchet-bd4a78937ffe2f37386dae4ae8817e33422c1267.tar.bz2
android_packages_apps_Trebuchet-bd4a78937ffe2f37386dae4ae8817e33422c1267.zip
Merge "Revert "Adding Launcher3 callbacks for trimming memory."" into ub-launcher3-almonte
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java3
-rw-r--r--src/com/android/launcher3/LauncherCallbacks.java1
-rw-r--r--src/com/android/launcher3/LauncherExtension.java4
3 files changed, 0 insertions, 8 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 591eb6474..5d8e136cd 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3791,9 +3791,6 @@ public class Launcher extends Activity
if (mAppsCustomizeTabHost != null) {
mAppsCustomizeTabHost.trimMemory();
}
- if (mLauncherCallbacks != null) {
- mLauncherCallbacks.onTrimMemory(level);
- }
}
}
diff --git a/src/com/android/launcher3/LauncherCallbacks.java b/src/com/android/launcher3/LauncherCallbacks.java
index d8128d6e5..a1f4e0b90 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -42,7 +42,6 @@ public interface LauncherCallbacks {
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.
diff --git a/src/com/android/launcher3/LauncherExtension.java b/src/com/android/launcher3/LauncherExtension.java
index fe9bd6c23..b264042cf 100644
--- a/src/com/android/launcher3/LauncherExtension.java
+++ b/src/com/android/launcher3/LauncherExtension.java
@@ -108,10 +108,6 @@ public class LauncherExtension extends Launcher {
}
@Override
- public void onTrimMemory(int level) {
- }
-
- @Override
public void onLauncherProviderChange() {
}