diff options
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 14cacfb9b..9594ac0e6 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 bb3d80c8d..0938ffc19 100644 --- a/src/com/android/camera/ui/CameraControls.java +++ b/src/com/android/camera/ui/CameraControls.java @@ -33,6 +33,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewPropertyAnimator; import android.widget.FrameLayout; +import android.widget.LinearLayout; import android.widget.TextView; import java.util.ArrayList; @@ -77,7 +78,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; @@ -231,7 +233,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 @@ -801,8 +804,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 + " "); } } |