diff options
| -rw-r--r-- | core/java/android/view/TextureView.java | 2 | ||||
| -rw-r--r-- | tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index 51f6640..4790289 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -166,7 +166,7 @@ public class TextureView extends View { public void setOpaque(boolean opaque) { if (opaque != mOpaque) { mOpaque = opaque; - updateLayer(); + if (mLayer != null) updateLayer(); } } diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java index e82d9e9..9bc1fe0 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java @@ -54,7 +54,7 @@ public class TextureViewActivity extends Activity implements TextureView.Surface @Override public void onClick(View v) { if (mAdded) { - mAnimatorSet.cancel(); + if (mAnimatorSet != null) mAnimatorSet.cancel(); mContent.removeView(mTextureView); } else { mContent.addView(mTextureView); @@ -84,10 +84,10 @@ public class TextureViewActivity extends Activity implements TextureView.Surface mTextureView.setCameraDistance(5000); - ObjectAnimator rotationY = ObjectAnimator.ofFloat(mTextureView, "rotationY", 0.0f, 360.0f); - rotationY.setRepeatMode(ObjectAnimator.REVERSE); - rotationY.setRepeatCount(ObjectAnimator.INFINITE); - rotationY.setDuration(4000); +// ObjectAnimator rotationY = ObjectAnimator.ofFloat(mTextureView, "rotationY", 0.0f, 360.0f); +// rotationY.setRepeatMode(ObjectAnimator.REVERSE); +// rotationY.setRepeatCount(ObjectAnimator.INFINITE); +// rotationY.setDuration(4000); // ObjectAnimator alpha = ObjectAnimator.ofFloat(mTextureView, "alpha", 1.0f, 0.0f); // alpha.setRepeatMode(ObjectAnimator.REVERSE); |