summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2012-11-07 15:06:45 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-07 15:06:45 -0800
commit9a962d7c7df9ff762e3d9798cde868ad73b164db (patch)
tree228ccfa2dd51c9ce20a7c8f8f49438a0f166a480
parente4cc20d1148addab9f6f27bad70b3f6d437ea06c (diff)
parent64091a1da0e87937ad42c8ae0d5e3dd3913b297b (diff)
am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b': 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 893df2690bc3..213057ce781d 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
@@ -152,6 +152,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() {
try {
int width = getRootView().getWidth();