From 5ffb42bb05ccb667ef52017faf925a385c9bd7a1 Mon Sep 17 00:00:00 2001 From: Byunghun Jeon Date: Fri, 16 Jan 2015 17:04:29 -0800 Subject: SnapdragonCamera: New shutter Icons Add new shutter icons for SnapdragonCamera Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb --- src/com/android/camera/WideAnglePanoramaUI.java | 2 +- src/com/android/camera/ui/CameraControls.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/com/android/camera') diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 3b1c4b17f..4b403f2d9 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -297,7 +297,7 @@ public class WideAnglePanoramaUI implements } public void reset() { - mShutterButton.setImageResource(R.drawable.btn_new_shutter); + mShutterButton.setImageResource(R.drawable.btn_new_shutter_panorama); mReviewLayout.setVisibility(View.GONE); mCaptureProgressBar.setVisibility(View.INVISIBLE); } diff --git a/src/com/android/camera/ui/CameraControls.java b/src/com/android/camera/ui/CameraControls.java index c2c33e785..14f27a36d 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -28,6 +28,7 @@ import android.util.AttributeSet; import android.view.View; import android.view.ViewPropertyAnimator; import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.TextView; import java.util.ArrayList; @@ -70,7 +71,8 @@ public class CameraControls extends RotatableLayout { private boolean[] mTempEnabled = new boolean[9]; private boolean mLocSet = false; - private TextView mRemainingPhotos; + private LinearLayout mRemainingPhotos; + private TextView mRemainingPhotosText; private int mPreviewRatio; private static int mTopMargin = 0; @@ -217,7 +219,8 @@ public class CameraControls extends RotatableLayout { mPreview = findViewById(R.id.preview_thumb); mSceneModeSwitcher = findViewById(R.id.scene_mode_switcher); mFilterModeSwitcher = findViewById(R.id.filter_mode_switcher); - mRemainingPhotos = (TextView) findViewById(R.id.remaining_photos); + mRemainingPhotos = (LinearLayout) findViewById(R.id.remaining_photos); + mRemainingPhotosText = (TextView) findViewById(R.id.remaining_photos_text); } @Override @@ -745,8 +748,7 @@ public class CameraControls extends RotatableLayout { mRemainingPhotos.setVisibility(View.GONE); } else { mRemainingPhotos.setVisibility(View.VISIBLE); - mRemainingPhotos.setText(String.format( - getResources().getString(R.string.remaining_photos_format), remaining)); + mRemainingPhotosText.setText(remaining + " "); } } -- cgit v1.2.3