am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.

* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
  Fix regression in camera transition.

diff --cc policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
index 893df26,0f5817a..213057c
--- 1/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
--- 2/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/CameraWidgetFrame.java
@@@ -152,12 -188,24 +152,22 @@@ public class CameraWidgetFrame extends 
          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];
          try {
 -            final int width = getRootView().getWidth();
 -            final int height = getRootView().getHeight();
 +            int width = getRootView().getWidth();
 +            int height = getRootView().getHeight();
              if (mRenderedSize.x == width && mRenderedSize.y == height) {
 -                if (DEBUG) Log.d(TAG, String.format("Already rendered at size=%sx%s",
 +                if (DEBUG) Log.d(TAG, String.format("already rendered at size=%sx%s",
                          width, height));
                  return;
              }