diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-23 22:40:29 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-23 22:40:29 -0800 |
commit | cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17 (patch) | |
tree | e32b7a8e7bc8eaf4d3752c2aafe09e3d90c217b4 /src/com/android/camera/ui | |
parent | be86a06bfd8ccc0b3a6f597903ba1181a9b8f875 (diff) | |
parent | 5ffb42bb05ccb667ef52017faf925a385c9bd7a1 (diff) | |
download | android_packages_apps_Snap-cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17.tar.gz android_packages_apps_Snap-cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17.tar.bz2 android_packages_apps_Snap-cb55a7c4f4a4cda67fbb4d9c85eed46e2c40fa17.zip |
Merge "SnapdragonCamera: New shutter Icons"
Diffstat (limited to 'src/com/android/camera/ui')
-rw-r--r-- | src/com/android/camera/ui/CameraControls.java | 10 |
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 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 + " "); } } |