summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/camera2arrays.xml93
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/qcomstrings.xml12
-rw-r--r--res/values/styles.xml10
4 files changed, 73 insertions, 44 deletions
diff --git a/res/values/camera2arrays.xml b/res/values/camera2arrays.xml
index 1f590fc32..e5fcb7fdf 100644
--- a/res/values/camera2arrays.xml
+++ b/res/values/camera2arrays.xml
@@ -34,8 +34,8 @@
</string-array>
<string-array name="pref_camera2_camera2_entryvalues" translatable="false">
- <item>@string/pref_camera2_camera2_value_disable</item>
- <item>@string/pref_camera2_camera2_value_enable</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<string-array name="pref_camera2_mono_only_entries" translatable="true">
@@ -44,8 +44,8 @@
</string-array>
<string-array name="pref_camera2_mono_only_entryvalues" translatable="false">
- <item>on</item>
- <item>off</item>
+ <item>@string/setting_on_value</item>
+ <item>@string/setting_off_value</item>
</string-array>
<string-array name="pref_camera2_initial_camera_entries" translatable="true">
@@ -86,8 +86,8 @@
</string-array>
<string-array name="pref_camera2_mono_preview_entryvalues" translatable="false">
- <item>@string/pref_camera2_mono_preview_value_on</item>
- <item>@string/pref_camera2_mono_preview_value_off</item>
+ <item>@string/setting_on_value</item>
+ <item>@string/setting_off_value</item>
</string-array>
<string-array name="pref_camera2_clearsight_entries" translatable="true">
@@ -96,8 +96,8 @@
</string-array>
<string-array name="pref_camera2_clearsight_entryvalues" translatable="false">
- <item>@string/pref_camera2_clearsight_value_off</item>
- <item>@string/pref_camera2_clearsight_value_on</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<string-array name="pref_camera2_mpo_entries" translatable="true">
@@ -158,21 +158,21 @@
</string-array>
<array name="pref_camera2_scenemode_thumbnails" translatable="false">
- <item>@drawable/ic_scene_mode_auto</item>
- <item>@drawable/ic_scene_mode_hdr</item>
- <item>@drawable/ic_scene_mode_hdr</item>
- <item>@drawable/ic_scene_mode_refocus</item>
- <item>@drawable/ic_scene_mode_optizoom</item>
- <item>@drawable/ic_scene_mode_portrait</item>
- <item>@drawable/ic_scene_mode_landscape</item>
- <item>@drawable/ic_scene_mode_sports</item>
- <item>@drawable/ic_scene_mode_flower</item>
- <item>@drawable/ic_scene_mode_backlight</item>
- <item>@drawable/ic_scene_mode_candlelight</item>
- <item>@drawable/ic_scene_mode_sunset</item>
- <item>@drawable/ic_scene_mode_night</item>
- <item>@drawable/ic_scene_mode_beach</item>
- <item>@drawable/ic_scene_mode_snow</item>
+ <item>@drawable/auto</item>
+ <item>@drawable/hdr</item>
+ <item>@drawable/hdr</item>
+ <item>@drawable/ubifocus</item>
+ <item>@drawable/optizoom</item>
+ <item>@drawable/portrait</item>
+ <item>@drawable/landscape</item>
+ <item>@drawable/sports</item>
+ <item>@drawable/flower</item>
+ <item>@drawable/backlight</item>
+ <item>@drawable/candlelight</item>
+ <item>@drawable/sunset</item>
+ <item>@drawable/night</item>
+ <item>@drawable/beach</item>
+ <item>@drawable/snow</item>
<item>@drawable/ic_scene_mode_smartauto</item>
<item>@drawable/pick_the_best_photo</item>
</array>
@@ -297,31 +297,26 @@
<!-- Camera Preferences flash mode dialog box entries -->
<string-array name="pref_camera2_flashmode_entries" translatable="false">
<item>@string/pref_camera_flashmode_entry_off</item>
- <item>@string/pref_camera_flashmode_entry_auto</item>
<item>@string/pref_camera_flashmode_entry_on</item>
</string-array>
<string-array name="pref_camera2_flashmode_labels" translatable="false">
<item>@string/pref_camera_flashmode_label_off</item>
- <item>@string/pref_camera_flashmode_label_auto</item>
<item>@string/pref_camera_flashmode_label_on</item>
</string-array>
<string-array name="pref_camera2_flashmode_entryvalues" translatable="false">
- <item>1</item>
- <item>2</item>
- <item>3</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<array name="pref_camera2_flashmode_icons" translatable="false">
<item>@drawable/ic_flash_off_holo_light</item>
- <item>@drawable/ic_flash_auto_holo_light</item>
<item>@drawable/ic_flash_on_holo_light</item>
</array>
<array name="pref_camera2_flashmode_largeicons" translatable="false">
<item>@drawable/ic_flash_off_holo_light</item>
- <item>@drawable/ic_flash_auto_holo_light</item>
<item>@drawable/ic_flash_on_holo_light</item>
</array>
@@ -431,8 +426,8 @@
</string-array>
<string-array name="pref_camera2_recordlocation_entryvalues" translatable="false">
- <item>off</item>
- <item>on</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<array name="pref_camera2_recordlocation_entries" translatable="false">
@@ -566,8 +561,8 @@
</string-array>
<string-array name="pref_camera2_redeyereduction_entryvalues" translatable="false">
- <item>disable</item>
- <item>enable</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<!-- Camera Preferences Long Shot dialog box entries -->
@@ -586,8 +581,8 @@
<item>@string/pref_camera_filter_mode_entry_on</item>
</string-array>
<string-array name="pref_camera2_filter_mode_entryvalues" translatable="false">
- <item>Off</item>
- <item>On</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<string-array name="pref_camera2_filter_mode_icons" translatable="false">
@@ -668,8 +663,8 @@
</string-array>
<string-array name="pref_camera2_dis_entryvalues" translatable="false">
- <item>@string/pref_camera_dis_value_disable</item>
- <item>@string/pref_camera_dis_value_enable</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<string-array name="pref_camera2_noise_reduction_entries" translatable="false">
@@ -816,8 +811,8 @@ for time lapse recording -->
</string-array>
<string-array name="pref_camera2_facedetection_entryvalues" translatable="false">
- <item>off</item>
- <item>on</item>
+ <item>@string/setting_off_value</item>
+ <item>@string/setting_on_value</item>
</string-array>
<string-array name="pref_camera2_videosnap_entries" translatable="true">
@@ -826,8 +821,22 @@ for time lapse recording -->
</string-array>
<string-array name="pref_camera2_videosnap_entryvalues" translatable="false">
- <item>@string/pref_camera2_videosnap_value_enable</item>
- <item>@string/pref_camera2_videosnap_value_disable</item>
+ <item>@string/setting_on_value</item>
+ <item>@string/setting_off_value</item>
+ </string-array>
+
+ <string-array name="pref_camera2_timer_entries" translatable="false">
+ <item>@string/pref_camera2_timer_entry_off</item>
+ <item>@string/pref_camera2_timer_entry_2sec</item>
+ <item>@string/pref_camera2_timer_entry_5sec</item>
+ <item>@string/pref_camera2_timer_entry_10sec</item>
+ </string-array>
+
+ <string-array name="pref_camera2_timer_entryvalues" translatable="false">
+ <item>@string/pref_camera2_timer_value_off</item>
+ <item>@string/pref_camera2_timer_value_2sec</item>
+ <item>@string/pref_camera2_timer_value_5sec</item>
+ <item>@string/pref_camera2_timer_value_10sec</item>
</string-array>
<string-array name="pref_camera2_shutter_sound_entries" translatable="true">
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 96394ad66..2a58a33e2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -165,7 +165,7 @@
<dimen name="scene_mode_padding">10dp</dimen>
<dimen name="filter_mode_height">100dp</dimen>
<dimen name="filter_mode_width">100dp</dimen>
- <dimen name="filter_mode_padding">10dp</dimen>
+ <dimen name="filter_mode_padding">0dp</dimen>
<dimen name="remaining_photos_margin">67dp</dimen>
<dimen name="tsmakeup_mode_paddingBottom">96dp</dimen>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 330cb8979..9d87cb1ce 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -999,7 +999,7 @@
<string name="pref_camera2_scenemode_default" translatable="false">0</string>
<string name="pref_camera2_whitebalance_default" translatable="false">1</string>
<string name="pref_camera2_coloreffect_default" translatable="false">0</string>
- <string name="pref_camera2_flashmode_default" translatable="false">2</string>
+ <string name="pref_camera2_flashmode_default" translatable="false">@string/setting_off_value</string>
<string name="pref_camera2_makeup_title" translatable="true">Makeup</string>
@@ -1034,5 +1034,15 @@
<string name="pref_camera2_shutter_sound_entry_on" translatable="true">On</string>
<string name="pref_camera2_shutter_sound_entry_off" translatable="true">Off</string>
<string name="pref_camera2_shutter_sound_title" translatable="true">Shutter Sound</string>
+
+ <string name="pref_camera2_timer_entry_off" translatable="false">Off</string>
+ <string name="pref_camera2_timer_entry_2sec" translatable="false">2 seconds</string>
+ <string name="pref_camera2_timer_entry_5sec" translatable="false">5 seconds</string>
+ <string name="pref_camera2_timer_entry_10sec" translatable="false">10 seconds</string>
+
+ <string name="pref_camera2_timer_value_off" translatable="false">0</string>
+ <string name="pref_camera2_timer_value_2sec" translatable="false">2</string>
+ <string name="pref_camera2_timer_value_5sec" translatable="false">5</string>
+ <string name="pref_camera2_timer_value_10sec" translatable="false">10</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4a7284874..765210fe2 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,6 +19,10 @@
<style name="Theme.ProxyLauncher" parent="@android:Theme.Translucent.NoTitleBar">
</style>
+ <style name="Theme.OneUISettings" parent="@android:style/Theme.Material.Light.NoActionBar.Fullscreen">
+ <item name="android:colorAccent">#5999e1</item>
+ </style>
+
<style name="Theme.Camera" parent="Theme.CameraBase">
<item name="android:windowFullscreen">true</item>
<item name="android:windowActionBar">false</item>
@@ -262,6 +266,12 @@
<item name="android:layout_height">@dimen/toggle_outer_size</item>
<item name="android:scaleType">center</item>
</style>
+ <style name="OneUIMenuButton">
+ <item name="android:layout_width">45dp</item>
+ <item name="android:layout_height">45dp</item>
+ <item name="android:padding">10dp</item>
+ <item name="android:scaleType">fitCenter</item>
+ </style>
<style name="MenuIndicator">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 15:51:36 +0000