diff options
| author | Adam Cohen <adamcohen@google.com> | 2015-02-06 23:34:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 23:34:26 +0000 |
| commit | 762d08eeada0f81c38591661bb4b9091f6926ff3 (patch) | |
| tree | 66acf2b8357c9fabe8afb21ed5eb6c8d94cf8a86 /src | |
| parent | 9d083a1c2a3d82c631e00e275be99e18ff0209c3 (diff) | |
| parent | bd4a78937ffe2f37386dae4ae8817e33422c1267 (diff) | |
| download | android_packages_apps_Trebuchet-762d08eeada0f81c38591661bb4b9091f6926ff3.tar.gz android_packages_apps_Trebuchet-762d08eeada0f81c38591661bb4b9091f6926ff3.tar.bz2 android_packages_apps_Trebuchet-762d08eeada0f81c38591661bb4b9091f6926ff3.zip | |
am bd4a7893: Merge "Revert "Adding Launcher3 callbacks for trimming memory."" into ub-launcher3-almonte
* commit 'bd4a78937ffe2f37386dae4ae8817e33422c1267':
Revert "Adding Launcher3 callbacks for trimming memory."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherCallbacks.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherExtension.java | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d401a9867..61915b755 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3767,9 +3767,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() { } |