diff options
| -rw-r--r-- | res/drawable-hdpi/back.png | bin | 32598 -> 0 bytes | |||
| -rw-r--r-- | res/layout/screenshot.xml | 9 | ||||
| -rw-r--r-- | src/com/android/nfc/SendUi.java | 21 |
3 files changed, 1 insertions, 29 deletions
diff --git a/res/drawable-hdpi/back.png b/res/drawable-hdpi/back.png Binary files differdeleted file mode 100644 index dcad41d..0000000 --- a/res/drawable-hdpi/back.png +++ /dev/null diff --git a/res/layout/screenshot.xml b/res/layout/screenshot.xml index 2e12a59..24a3a71 100644 --- a/res/layout/screenshot.xml +++ b/res/layout/screenshot.xml @@ -22,14 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - <ImageView android:id="@+id/back" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:adjustViewBounds="true" - android:src="@drawable/back" - android:scaleType="centerCrop" - android:visibility="gone" - /> + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/src/com/android/nfc/SendUi.java b/src/com/android/nfc/SendUi.java index a198811..37ac6e0 100644 --- a/src/com/android/nfc/SendUi.java +++ b/src/com/android/nfc/SendUi.java @@ -77,9 +77,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, static final int TEXT_HINT_ALPHA_DURATION_MS = 500; static final int TEXT_HINT_ALPHA_START_DELAY_MS = 300; - static final float[] BACKGROUND_SCALE_RANGE = {2.0f, 1.0f}; - static final int BACKGROUND_SCALE_DURATION_MS = 5000; - static final int FINISH_SCALE_UP = 0; static final int FINISH_SLIDE_OUT = 1; @@ -94,7 +91,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, final StatusBarManager mStatusBarManager; final View mScreenshotLayout; final ImageView mScreenshotView; - final ImageView mBackgroundImage; final TextureView mTextureView; final TextView mTextHint; final Callback mCallback; @@ -104,7 +100,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, final ObjectAnimator mFadeInAnimator; final ObjectAnimator mHintAnimator; final AnimatorSet mSuccessAnimatorSet; - final ObjectAnimator mBackgroundAnimator; final boolean mHardwareAccelerated; Bitmap mScreenshotBitmap; @@ -140,7 +135,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, mTextureView = (TextureView) mScreenshotLayout.findViewById(R.id.fireflies); mTextureView.setSurfaceTextureListener(this); - mBackgroundImage = (ImageView) mScreenshotLayout.findViewById(R.id.back); // We're only allowed to use hardware acceleration if // isHighEndGfx() returns true - otherwise, we're too limited // on resources to do it. @@ -148,11 +142,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, int hwAccelerationFlags = mHardwareAccelerated ? WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED : 0; - if (!mHardwareAccelerated) { - // Only show background in case we're not hw-accelerated - mBackgroundImage.setVisibility(View.VISIBLE); - } - mWindowLayoutParams = new WindowManager.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT, 0, 0, WindowManager.LayoutParams.TYPE_SYSTEM_ALERT, @@ -209,12 +198,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, mSuccessAnimatorSet = new AnimatorSet(); mSuccessAnimatorSet.playSequentially(mFastCloneAnimator, mFadeInAnimator); - scaleUpX = PropertyValuesHolder.ofFloat("scaleX", BACKGROUND_SCALE_RANGE); - scaleUpY = PropertyValuesHolder.ofFloat("scaleY", BACKGROUND_SCALE_RANGE); - mBackgroundAnimator = ObjectAnimator.ofPropertyValuesHolder(mBackgroundImage, scaleUpX, scaleUpY); - mBackgroundAnimator.setInterpolator(new DecelerateInterpolator(2.0f)); - mBackgroundAnimator.setDuration(BACKGROUND_SCALE_DURATION_MS); - mAttached = false; } @@ -274,10 +257,6 @@ public class SendUi implements Animator.AnimatorListener, View.OnTouchListener, mAttached = true; mPreAnimator.start(); - - if (!mHardwareAccelerated) { - mBackgroundAnimator.start(); - } } /** Show starting send animation */ |
