AI 143309: am: CL 143160 am: CL 142856 new-new-new-new rotation animation. it may still change one more time.

  Original author: mathias
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143309

1 files changed, 8 insertions, 1 deletions

diff --git a/libs/surfaceflinger/OrientationAnimation.cpp b/libs/surfaceflinger/OrientationAnimation.cpp
index f6f1326..e59688e 100644
--- a/libs/surfaceflinger/OrientationAnimation.cpp
+++ b/libs/surfaceflinger/OrientationAnimation.cpp
@@ -21,6 +21,7 @@
 #include <limits.h>
 
 #include "LayerOrientationAnim.h"
+#include "LayerOrientationAnimRotate.h"
 #include "OrientationAnimation.h"
 #include "SurfaceFlinger.h"
 #include "VRamHeap.h"
@@ -112,8 +113,14 @@ bool OrientationAnimation::prepare()
     bitmap.getBitmapSurface(&front);
     hw.copyFrontToImage(front);
 
-    LayerOrientationAnim* l = new LayerOrientationAnim(
+    LayerOrientationAnimBase* l;
+    
+    l = new LayerOrientationAnim(
             mFlinger.get(), 0, this, bitmap, bitmapIn);
+
+    //l = new LayerOrientationAnimRotate(
+    //        mFlinger.get(), 0, this, bitmap, bitmapIn);
+
     l->initStates(w, h, 0);
     l->setLayer(INT_MAX-1);
     mFlinger->addLayer(l);