merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 59a851e..ce9cdad 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -131,7 +131,7 @@
<string name="duration" msgid="8160058911218541616">"Duración"</string>
<string name="mimetype" msgid="8024168704337990470">"Tipo de MIME"</string>
<string name="file_size" msgid="8486169301588318915">"Tamaño del archivo"</string>
- <string name="maker" msgid="7921835498034236197">"Creador"</string>
+ <string name="maker" msgid="7921835498034236197">"Fabricante"</string>
<string name="model" msgid="8240207064064337366">"Modelo"</string>
<string name="flash" msgid="2816779031261147723">"Flash"</string>
<string name="aperture" msgid="5920657630303915195">"Apertura"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d586aaf..f9df9f8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -256,10 +256,10 @@
<string name="pref_camera_picturesize_entry_13mp" msgid="675309554194481780">"۱۳ مگا پیکسل"</string>
<string name="pref_camera_picturesize_entry_8mp" msgid="259953780932849079">"۸ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_5mp" msgid="2882928212030661159">"۵ مگاپیکسل"</string>
- <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"۴ مگاپیکسل"</string>
+ <string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"۴ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"۳ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"۲ مگاپیکسل"</string>
- <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"۲ مگاپیکسل (۱۶:۹)"</string>
+ <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"۲ مگاپیکسل (۱۶:۹)"</string>
<string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"۱.۳ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"۱ مگاپیکسل"</string>
<string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b86d5ec..2f489ee 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -259,7 +259,7 @@
<string name="pref_camera_picturesize_entry_4mp" msgid="933242108272469142">"4 megapiksela"</string>
<string name="pref_camera_picturesize_entry_3mp" msgid="741415860337400696">"3 megapiksela"</string>
<string name="pref_camera_picturesize_entry_2mp" msgid="1753709802245460393">"2 megapiksela"</string>
- <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2M piks. (16:9)"</string>
+ <string name="pref_camera_picturesize_entry_2mp_wide" msgid="5359490802026616612">"2 mpiks.(16:9)"</string>
<string name="pref_camera_picturesize_entry_1_3mp" msgid="829109608140747258">"1,3 megapiksela"</string>
<string name="pref_camera_picturesize_entry_1mp" msgid="1669725616780375066">"1 megapiksel"</string>
<string name="pref_camera_picturesize_entry_vga" msgid="806934254162981919">"VGA"</string>
diff --git a/res/values/filtershow_values.xml b/res/values/filtershow_values.xml
index f516a39..2e7dce4 100644
--- a/res/values/filtershow_values.xml
+++ b/res/values/filtershow_values.xml
@@ -17,4 +17,7 @@
<resources>
<!-- Specify the screen orientation -->
<bool name="only_use_portrait">true</bool>
-</resources>
\ No newline at end of file
+
+ <!-- Text size for the state panel -->
+ <dimen name="state_panel_text_size">16dip</dimen>
+</resources>
diff --git a/src/com/android/gallery3d/filtershow/state/StateView.java b/src/com/android/gallery3d/filtershow/state/StateView.java
index 9353a43..73d5784 100644
--- a/src/com/android/gallery3d/filtershow/state/StateView.java
+++ b/src/com/android/gallery3d/filtershow/state/StateView.java
@@ -78,6 +78,7 @@
mTextColor = res.getColor(R.color.filtershow_stateview_text);
mSelectedBackgroundColor = res.getColor(R.color.filtershow_stateview_selected_background);
mSelectedTextColor = res.getColor(R.color.filtershow_stateview_selected_text);
+ mTextSize = res.getDimensionPixelSize(R.dimen.state_panel_text_size);
}
public String getText() {
