commit 553f13a13ee81f4a20fefaadc47e1cca460730df
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 26 21:07:47 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 21:07:47 2018 +0000
tree b3bd23909313b5aeba6ad3db718b2c9e4a442a7d
parent 473730fcf9658d8e15bb7633207f1dc29c4b3f7e
parent 4df80700c4363561f06f2f75c07743ab4b8aa181

Merge "Shared touch and drag slops for quick step changes with density (2/3)" into ub-launcher3-edmonton

quickstep/src/com/android/quickstep/RecentsActivity.java

diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java
index 31bead1..b780a3e 100644
--- a/quickstep/src/com/android/quickstep/RecentsActivity.java
+++ b/quickstep/src/com/android/quickstep/RecentsActivity.java
@@ -231,7 +231,7 @@
         super.onStop();
 
         // Workaround for b/78520668, explicitly trim memory once UI is hidden
-        UiFactory.onTrimMemory(this, TRIM_MEMORY_UI_HIDDEN);
+        onTrimMemory(TRIM_MEMORY_UI_HIDDEN);
     }
 
     @Override

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1285a2b..2c08169 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -738,7 +738,7 @@
         getStateManager().moveToRestState();
 
         // Workaround for b/78520668, explicitly trim memory once UI is hidden
-        UiFactory.onTrimMemory(this, TRIM_MEMORY_UI_HIDDEN);
+        onTrimMemory(TRIM_MEMORY_UI_HIDDEN);
     }
 
     @Override