summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLikai Ding <likaid@codeaurora.org>2014-12-15 16:05:14 +0800
committerLikai Ding <likaid@codeaurora.org>2014-12-22 11:24:02 +0800
commit750861a411cd44eef5c56cd7f0a1a3d46ef00a32 (patch)
tree741d1e6708eaf3c2a076710c4ce6486763a939e9 /res
parent5c3a14e425dabf710b58c87c44a368469cbb5baf (diff)
downloadandroid_packages_apps_Snap-750861a411cd44eef5c56cd7f0a1a3d46ef00a32.tar.gz
android_packages_apps_Snap-750861a411cd44eef5c56cd7f0a1a3d46ef00a32.tar.bz2
android_packages_apps_Snap-750861a411cd44eef5c56cd7f0a1a3d46ef00a32.zip
SnapdragonCamera: show how many more pictures can be taken
Prompt to user an estimation of how many more pictures can be taken, calculated based on available storage. Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/camera_controls.xml8
-rw-r--r--res/layout-port/camera_controls.xml8
-rw-r--r--res/values-zh-rCN/strings.xml2
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/qcomarrays.xml13
-rw-r--r--res/values/strings.xml2
6 files changed, 35 insertions, 0 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index 65a17caae..eecc13f2e 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -109,4 +109,12 @@
android:layout_gravity="center" />
</com.android.camera.ui.RotatableLayout>
+ <TextView
+ android:id="@+id/remaining_photos"
+ android:background="@android:color/transparent"
+ android:textColor="@android:color/white"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone" />
+
</com.android.camera.ui.CameraControls>
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index bf3cda0ab..52be755dd 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -109,4 +109,12 @@
android:layout_gravity="center" />
</com.android.camera.ui.RotatableLayout>
+ <TextView
+ android:id="@+id/remaining_photos"
+ android:background="@android:color/transparent"
+ android:textColor="@android:color/white"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone" />
+
</com.android.camera.ui.CameraControls>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e1a8f7985..e248a4523 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -527,4 +527,6 @@
<!-- The alas of CameraActivity for gesture operation -->
<string name="camera_gesture_title">打开相机</string>
+
+ <string name="remaining_photos_format">剩余 %d 张</string>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6b81ab906..03e3ce3cd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -164,4 +164,6 @@
<dimen name="filter_mode_height">100dp</dimen>
<dimen name="filter_mode_width">80dp</dimen>
<dimen name="filter_mode_padding">10dp</dimen>
+
+ <dimen name="remaining_photos_margin">67dp</dimen>
</resources>
diff --git a/res/values/qcomarrays.xml b/res/values/qcomarrays.xml
index 73c34bd39..23ba3d382 100644
--- a/res/values/qcomarrays.xml
+++ b/res/values/qcomarrays.xml
@@ -203,6 +203,19 @@
<item>normal</item>
</string-array>
+ <!-- Rough estimates of jpeg compression ratio corresponding to qualities defined above. -->
+ <integer-array name="jpegquality_compression_ratio">
+ <item>48</item>
+ <item>38</item>
+ <item>31</item>
+ <item>20</item>
+ <item>11</item>
+ <item>6</item>
+ <item>20</item>
+ <item>31</item>
+ <item>38</item>
+ </integer-array>
+
<!-- Camera Preferences Color effect dialog box entries -->
<string-array name="pref_camera_coloreffect_entries" translatable="false">
<item>@string/pref_camera_coloreffect_entry_none</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 54ef31f9d..0ad549a41 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -712,4 +712,6 @@ CHAR LIMIT = NONE] -->
<string name="pref_camera_video_rotation_label_90">90</string>
<string name="pref_camera_video_rotation_label_180">180</string>
<string name="pref_camera_video_rotation_label_270">270</string>
+
+ <string name="remaining_photos_format">%d left</string>
</resources>