summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChih-yu Huang <akahuang@google.com>2011-08-29 02:41:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-29 02:41:53 -0700
commit4a7c00fed8ad1753fe7bf016267850c040c73c9f (patch)
tree838ee10dae555e2662a99a868973c9b40736ef41 /src
parent4bbbfc12a05120a2d06e07ba1252367d42e6bb82 (diff)
parent68798bfa946e812beb9190fa7c98a316392fbce6 (diff)
downloadpackages_apps_LegacyCamera-4a7c00fed8ad1753fe7bf016267850c040c73c9f.zip
packages_apps_LegacyCamera-4a7c00fed8ad1753fe7bf016267850c040c73c9f.tar.gz
packages_apps_LegacyCamera-4a7c00fed8ad1753fe7bf016267850c040c73c9f.tar.bz2
Merge "Change video recording shutter button and overflow assets"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/VideoCamera.java2
-rw-r--r--src/com/android/camera/ui/IndicatorControl.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index dadc29a..75f91ae 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1375,7 +1375,7 @@ public class VideoCamera extends ActivityBase
private void showRecordingUI(boolean recording) {
if (recording) {
- mShutterButton.setBackgroundResource(R.drawable.btn_shutter_video);
+ mShutterButton.setBackgroundResource(R.drawable.btn_shutter_video_recording);
mRecordingTimeView.setText("");
mRecordingTimeView.setVisibility(View.VISIBLE);
if (mReviewControl != null) mReviewControl.setVisibility(View.GONE);
diff --git a/src/com/android/camera/ui/IndicatorControl.java b/src/com/android/camera/ui/IndicatorControl.java
index b31c751..2dd8777 100644
--- a/src/com/android/camera/ui/IndicatorControl.java
+++ b/src/com/android/camera/ui/IndicatorControl.java
@@ -92,7 +92,7 @@ public abstract class IndicatorControl extends RelativeLayout implements
// Add other settings indicator.
if (otherSettingKeys != null) {
addOtherSettingIndicator(mContext,
- R.drawable.ic_settings_holo_light, otherSettingKeys);
+ R.drawable.ic_menu_overflow, otherSettingKeys);
}
}