aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-08-01 02:31:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-01 02:31:22 -0700
commit31a61ce3876c46f409a54dc6080d262266f6b5dc (patch)
treeab8509ae3fa9f8dfdcf5534ed94ca58bb42f1774 /java/src
parentf2b54321078e3ebb9f960bd098c79e5aecb873a7 (diff)
parented56ea86d0114e85763e449a05b40e670addfc48 (diff)
downloadlatinime-31a61ce3876c46f409a54dc6080d262266f6b5dc.tar.gz
latinime-31a61ce3876c46f409a54dc6080d262266f6b5dc.tar.xz
latinime-31a61ce3876c46f409a54dc6080d262266f6b5dc.zip
am ed56ea86: Merge "Deallocate offscreen buffer for non-HW-accel draw"
* commit 'ed56ea86d0114e85763e449a05b40e670addfc48': Deallocate offscreen buffer for non-HW-accel draw
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardView.java4
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java2
2 files changed, 6 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 254b20b87..2a02682e5 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -605,4 +605,8 @@ public class KeyboardView extends View {
super.onDetachedFromWindow();
freeOffscreenBuffer();
}
+
+ public void deallocateMemory() {
+ freeOffscreenBuffer();
+ }
}
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index 35742ef8c..5334b45b6 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -1271,7 +1271,9 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
}
}
+ @Override
public void deallocateMemory() {
+ super.deallocateMemory();
mGestureTrailsPreview.deallocateMemory();
}
}