summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2012-11-06 12:44:21 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-06 12:44:21 -0800
commit8aa623628cbc7b859b1f94e5a09882fbe8cb209d (patch)
treecd013d0898ec311b043d383484c2f513e5ce1189
parent3eaa876cf317d064de1a32f1d34fd83b6e960e0b (diff)
parentae73c6908ffd3c450d56a4fde95513cfff19d8a2 (diff)
am ae73c690: Fix regression in camera transition.
* commit 'ae73c6908ffd3c450d56a4fde95513cfff19d8a2': Fix regression in camera transition.
-rw-r--r--policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java b/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
index dbd999913637..0f5817a333bc 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
@@ -188,6 +188,16 @@ public class CameraWidgetFrame extends KeyguardWidgetFrame implements View.OnCli
return iv;
}
+ @Override
+ public void setPivotX(float pivotX) {
+ // don't pivot me
+ }
+
+ @Override
+ public void setPivotY(float pivotY) {
+ // don't pivot me
+ }
+
public void render() {
final Throwable[] thrown = new Throwable[1];
final Bitmap[] offscreen = new Bitmap[1];