summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRockchip2015-01-29 08:45:05 +0800
committerRockchip2015-01-29 08:45:05 +0800
commit38a3cf1ec024f72e96be3e5829c1c7b3f70afb00 (patch)
tree0c912ee97a05ce9688ac56fc2b3a350b6554a162
parent650c0e09bb913fb3b04f6a580ca3db937f58a481 (diff)
not use animate for VideoStop,fix not smoothly when longtime to recording switch test
-rw-r--r--res/drawable-hdpi/ic_capture_video.pngbin0 -> 516 bytes
-rw-r--r--res/drawable-mdpi/ic_capture_video.pngbin0 -> 369 bytes
-rw-r--r--res/drawable-xhdpi/ic_capture_video.pngbin0 -> 557 bytes
-rw-r--r--res/drawable-xxhdpi/ic_capture_video.pngbin0 -> 844 bytes
-rw-r--r--res/drawable-xxxhdpi/ic_capture_video.pngbin0 -> 1369 bytes
-rw-r--r--res/drawable/ic_capture_video_stat.xml (renamed from res/drawable/ic_capture_video.xml)0
-rw-r--r--src/com/android/camera/ui/BottomBar.java4
7 files changed, 3 insertions, 1 deletions
diff --git a/res/drawable-hdpi/ic_capture_video.png b/res/drawable-hdpi/ic_capture_video.png
new file mode 100644
index 0000000..dc3d026
--- /dev/null
+++ b/res/drawable-hdpi/ic_capture_video.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_capture_video.png b/res/drawable-mdpi/ic_capture_video.png
new file mode 100644
index 0000000..b38059c
--- /dev/null
+++ b/res/drawable-mdpi/ic_capture_video.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_capture_video.png b/res/drawable-xhdpi/ic_capture_video.png
new file mode 100644
index 0000000..8bcdd81
--- /dev/null
+++ b/res/drawable-xhdpi/ic_capture_video.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_capture_video.png b/res/drawable-xxhdpi/ic_capture_video.png
new file mode 100644
index 0000000..685df78
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_capture_video.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_capture_video.png b/res/drawable-xxxhdpi/ic_capture_video.png
new file mode 100644
index 0000000..bddc238
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_capture_video.png
Binary files differ
diff --git a/res/drawable/ic_capture_video.xml b/res/drawable/ic_capture_video_stat.xml
index 8d5f83f..8d5f83f 100644
--- a/res/drawable/ic_capture_video.xml
+++ b/res/drawable/ic_capture_video_stat.xml
diff --git a/src/com/android/camera/ui/BottomBar.java b/src/com/android/camera/ui/BottomBar.java
index 551cc09..9edba28 100644
--- a/src/com/android/camera/ui/BottomBar.java
+++ b/src/com/android/camera/ui/BottomBar.java
@@ -440,7 +440,7 @@ public class BottomBar extends FrameLayout {
* Animates bar to a single stop button
*/
public void animateToVideoStop(int resId) {
- if (mOverLayBottomBar && mAnimatedCircleDrawable != null) {
+ /* if (mOverLayBottomBar && mAnimatedCircleDrawable != null) {
mAnimatedCircleDrawable.animateToSmallRadius();
mDrawCircle = true;
}
@@ -450,6 +450,8 @@ public class BottomBar extends FrameLayout {
getResources().getDrawable(resId));
mShutterButton.setImageDrawable(transitionDrawable);
transitionDrawable.startTransition(CIRCLE_ANIM_DURATION_MS);
+ */
+ mShutterButton.setImageResource(resId);
}
/**