summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ui/CameraControls.java
diff options
context:
space:
mode:
authorByunghun Jeon <bjeon@codeaurora.org>2015-01-16 17:04:29 -0800
committerByunghun Jeon <bjeon@codeaurora.org>2015-01-20 11:35:12 -0800
commit5ffb42bb05ccb667ef52017faf925a385c9bd7a1 (patch)
tree695e4ffbae30f9ed487fd86c2de96eed141e1105 /src/com/android/camera/ui/CameraControls.java
parent9badbd28c54a7110fcb3a42d06c908326866ec98 (diff)
downloadandroid_packages_apps_Snap-5ffb42bb05ccb667ef52017faf925a385c9bd7a1.tar.gz
android_packages_apps_Snap-5ffb42bb05ccb667ef52017faf925a385c9bd7a1.tar.bz2
android_packages_apps_Snap-5ffb42bb05ccb667ef52017faf925a385c9bd7a1.zip
SnapdragonCamera: New shutter Icons
Add new shutter icons for SnapdragonCamera Change-Id: Ic0abf1b509800133bbd9dbee0cc34ebca02e5bcb
Diffstat (limited to 'src/com/android/camera/ui/CameraControls.java')
-rw-r--r--src/com/android/camera/ui/CameraControls.java10
1 files changed, 6 insertions, 4 deletions
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 + " ");
}
}