summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Kozikowski <robertkoz@google.com>2015-02-04 18:38:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-04 18:38:31 +0000
commitacbe9f6546455672b2edf51928d4fee4b6e246ba (patch)
tree6bba6e6cf45d740d135c516b0ee7960329688147
parent4802b4107a66bc86996083b4835d1094ef4f4cbb (diff)
parent42f3b9e0283c30c40c286f9958ce0f8b02f85c52 (diff)
downloadandroid_packages_apps_Trebuchet-acbe9f6546455672b2edf51928d4fee4b6e246ba.tar.gz
android_packages_apps_Trebuchet-acbe9f6546455672b2edf51928d4fee4b6e246ba.tar.bz2
android_packages_apps_Trebuchet-acbe9f6546455672b2edf51928d4fee4b6e246ba.zip
Merge "Adding Launcher3 callbacks for trimming memory." into ub-launcher3-almonte
-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, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 5d8e136cd..591eb6474 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3791,6 +3791,9 @@ 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 a1f4e0b90..d8128d6e5 100644
--- a/src/com/android/launcher3/LauncherCallbacks.java
+++ b/src/com/android/launcher3/LauncherCallbacks.java
@@ -42,6 +42,7 @@ 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 b264042cf..fe9bd6c23 100644
--- a/src/com/android/launcher3/LauncherExtension.java
+++ b/src/com/android/launcher3/LauncherExtension.java
@@ -108,6 +108,10 @@ public class LauncherExtension extends Launcher {
}
@Override
+ public void onTrimMemory(int level) {
+ }
+
+ @Override
public void onLauncherProviderChange() {
}