diff options
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ic_viewfinder_focus_infinity.png | bin | 0 -> 2559 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_viewfinder_focus_macro.png | bin | 0 -> 2539 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_viewfinder_whitebalance.png | bin | 0 -> 1101 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_viewfinder_focus_infinity.png | bin | 0 -> 5206 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_viewfinder_focus_macro.png | bin | 0 -> 4754 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_viewfinder_whitebalance.png | bin | 0 -> 1566 bytes | |||
-rw-r--r-- | res/layout/camera.xml | 14 | ||||
-rw-r--r-- | res/values/arrays.xml | 16 |
8 files changed, 30 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_viewfinder_focus_infinity.png b/res/drawable-hdpi/ic_viewfinder_focus_infinity.png Binary files differnew file mode 100644 index 0000000..bed0f59 --- /dev/null +++ b/res/drawable-hdpi/ic_viewfinder_focus_infinity.png diff --git a/res/drawable-hdpi/ic_viewfinder_focus_macro.png b/res/drawable-hdpi/ic_viewfinder_focus_macro.png Binary files differnew file mode 100644 index 0000000..317d4a6 --- /dev/null +++ b/res/drawable-hdpi/ic_viewfinder_focus_macro.png diff --git a/res/drawable-hdpi/ic_viewfinder_whitebalance.png b/res/drawable-hdpi/ic_viewfinder_whitebalance.png Binary files differnew file mode 100644 index 0000000..0475dac --- /dev/null +++ b/res/drawable-hdpi/ic_viewfinder_whitebalance.png diff --git a/res/drawable-mdpi/ic_viewfinder_focus_infinity.png b/res/drawable-mdpi/ic_viewfinder_focus_infinity.png Binary files differnew file mode 100644 index 0000000..3971df8 --- /dev/null +++ b/res/drawable-mdpi/ic_viewfinder_focus_infinity.png diff --git a/res/drawable-mdpi/ic_viewfinder_focus_macro.png b/res/drawable-mdpi/ic_viewfinder_focus_macro.png Binary files differnew file mode 100644 index 0000000..10098fc --- /dev/null +++ b/res/drawable-mdpi/ic_viewfinder_focus_macro.png diff --git a/res/drawable-mdpi/ic_viewfinder_whitebalance.png b/res/drawable-mdpi/ic_viewfinder_whitebalance.png Binary files differnew file mode 100644 index 0000000..2f85711 --- /dev/null +++ b/res/drawable-mdpi/ic_viewfinder_whitebalance.png diff --git a/res/layout/camera.xml b/res/layout/camera.xml index 9b4cf32..8091891 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -58,6 +58,20 @@ <com.android.camera.IconIndicator android:layout_width="wrap_content" android:layout_height="wrap_content" + android:id="@+id/focus_icon" + camera:modes="@array/pref_camera_focusmode_entryvalues" + camera:icons="@array/focusmode_icons" + android:visibility="visible"/> + <com.android.camera.IconIndicator + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/whitebalance_icon" + camera:modes="@array/whitebalance_modes" + camera:icons="@array/whitebalance_icons" + android:visibility="visible"/> + <com.android.camera.IconIndicator + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:id="@+id/flash_icon" camera:modes="@array/pref_camera_flashmode_entryvalues" camera:icons="@array/flash_icons" diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 66519e9..bdbddef 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -84,6 +84,12 @@ <item>macro</item> </string-array> + <array name="focusmode_icons"> + <item>0</item> + <item>@drawable/ic_viewfinder_focus_infinity</item> + <item>@drawable/ic_viewfinder_focus_macro</item> + </array> + <!-- Camera Preferences flash mode dialog box entries --> <string-array name="pref_camera_flashmode_entries" translatable="false"> <item>@string/pref_camera_flashmode_entry_auto</item> @@ -136,6 +142,16 @@ <item>@string/pref_camera_whitebalance_entry_halogen</item> </string-array> + <string-array name="whitebalance_modes" translatable="false"> + <item>off</item> + <item>on</item> + </string-array> + + <array name="whitebalance_icons"> + <item>0</item> + <item>@drawable/ic_viewfinder_whitebalance</item> + </array> + <string-array name="pref_camera_whitebalance_entryvalues" translatable="false"> <item>auto</item> <item>incandescent</item> |