summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorChih-yu Huang <akahuang@google.com>2011-11-11 19:41:34 +0800
committerChih-yu Huang <akahuang@google.com>2011-11-11 22:15:28 +0800
commit204224ce0423e4a6a29fa015128131c71b9bb9d8 (patch)
treed49fbd81e6483d5b588fb5fdd52598c241f09766 /res
parentbba9566c7d74e80a53548853114a7512fb3d416f (diff)
downloadLegacyCamera-204224ce0423e4a6a29fa015128131c71b9bb9d8.zip
LegacyCamera-204224ce0423e4a6a29fa015128131c71b9bb9d8.tar.gz
LegacyCamera-204224ce0423e4a6a29fa015128131c71b9bb9d8.tar.bz2
Add indicators of settings on the viewfinder.
Add exposure, flash, scene, white balance, and focus indicators. bug:5039279 Change-Id: I7ef87ee35855030dbc8fdc2d4c52fa5d8b6549ba
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_indicators_cloudy.pngbin0 -> 815 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_fluorescent.pngbin0 -> 872 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_incandescent.pngbin0 -> 848 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_landscape.pngbin0 -> 1086 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_landscape_flash_auto.pngbin0 -> 1272 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_landscape_flash_off.pngbin0 -> 1289 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_landscape_flash_on.pngbin0 -> 949 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_macro.pngbin0 -> 1581 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_scn.pngbin0 -> 1269 bytes
-rw-r--r--res/drawable-hdpi/ic_indicators_sunlight.pngbin0 -> 903 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_cloudy.pngbin0 -> 615 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_fluorescent.pngbin0 -> 584 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_incandescent.pngbin0 -> 554 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_landscape.pngbin0 -> 800 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_landscape_flash_auto.pngbin0 -> 861 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_landscape_flash_off.pngbin0 -> 863 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_landscape_flash_on.pngbin0 -> 719 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_macro.pngbin0 -> 997 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_scn.pngbin0 -> 817 bytes
-rw-r--r--res/drawable-mdpi/ic_indicators_sunlight.pngbin0 -> 559 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_cloudy.pngbin0 -> 1091 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_fluorescent.pngbin0 -> 1674 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_incandescent.pngbin0 -> 1629 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_landscape.pngbin0 -> 1614 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_auto.pngbin0 -> 2121 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_off.pngbin0 -> 1998 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_on.pngbin0 -> 1443 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_macro.pngbin0 -> 2683 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_scn.pngbin0 -> 2347 bytes
-rw-r--r--res/drawable-sw600dp-hdpi/ic_indicators_sunlight.pngbin0 -> 1815 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_cloudy.pngbin0 -> 777 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_fluorescent.pngbin0 -> 1084 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_incandescent.pngbin0 -> 1066 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_landscape.pngbin0 -> 1137 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_auto.pngbin0 -> 1301 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_off.pngbin0 -> 1371 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_on.pngbin0 -> 975 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_macro.pngbin0 -> 1593 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_scn.pngbin0 -> 1423 bytes
-rw-r--r--res/drawable-sw600dp-mdpi/ic_indicators_sunlight.pngbin0 -> 1116 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_cloudy.pngbin0 -> 1405 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_fluorescent.pngbin0 -> 2265 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_incandescent.pngbin0 -> 2216 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_landscape.pngbin0 -> 2250 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_auto.pngbin0 -> 2889 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_off.pngbin0 -> 2740 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_on.pngbin0 -> 1899 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_macro.pngbin0 -> 3807 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_scn.pngbin0 -> 3384 bytes
-rw-r--r--res/drawable-sw600dp-xhdpi/ic_indicators_sunlight.pngbin0 -> 2457 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_cloudy.pngbin0 -> 1042 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_fluorescent.pngbin0 -> 1193 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_incandescent.pngbin0 -> 1204 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_landscape.pngbin0 -> 1506 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_landscape_flash_auto.pngbin0 -> 1749 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_landscape_flash_off.pngbin0 -> 1813 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_landscape_flash_on.pngbin0 -> 1289 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_macro.pngbin0 -> 2267 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_scn.pngbin0 -> 1778 bytes
-rw-r--r--res/drawable-xhdpi/ic_indicators_sunlight.pngbin0 -> 1312 bytes
-rw-r--r--res/layout-sw600dp/priority_indicators.xml (renamed from res/layout-w1024dp/priority_indicators.xml)22
-rw-r--r--res/layout/priority_indicators.xml26
-rw-r--r--res/values-sw600dp/styles.xml8
-rw-r--r--res/values/styles.xml5
64 files changed, 40 insertions, 21 deletions
diff --git a/res/drawable-hdpi/ic_indicators_cloudy.png b/res/drawable-hdpi/ic_indicators_cloudy.png
new file mode 100644
index 0000000..ced46ce
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_cloudy.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_fluorescent.png b/res/drawable-hdpi/ic_indicators_fluorescent.png
new file mode 100644
index 0000000..c3420c6
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_fluorescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_incandescent.png b/res/drawable-hdpi/ic_indicators_incandescent.png
new file mode 100644
index 0000000..be9c307
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_incandescent.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_landscape.png b/res/drawable-hdpi/ic_indicators_landscape.png
new file mode 100644
index 0000000..8636fc0
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_landscape.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-hdpi/ic_indicators_landscape_flash_auto.png
new file mode 100644
index 0000000..da3a0c9
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_landscape_flash_auto.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_off.png b/res/drawable-hdpi/ic_indicators_landscape_flash_off.png
new file mode 100644
index 0000000..11239f0
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_landscape_flash_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_landscape_flash_on.png b/res/drawable-hdpi/ic_indicators_landscape_flash_on.png
new file mode 100644
index 0000000..c7af702
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_landscape_flash_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_macro.png b/res/drawable-hdpi/ic_indicators_macro.png
new file mode 100644
index 0000000..0ec71d5
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_macro.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_scn.png b/res/drawable-hdpi/ic_indicators_scn.png
new file mode 100644
index 0000000..675b1c5
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_scn.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_indicators_sunlight.png b/res/drawable-hdpi/ic_indicators_sunlight.png
new file mode 100644
index 0000000..f7fcba6
--- /dev/null
+++ b/res/drawable-hdpi/ic_indicators_sunlight.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_cloudy.png b/res/drawable-mdpi/ic_indicators_cloudy.png
new file mode 100644
index 0000000..b089270
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_cloudy.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_fluorescent.png b/res/drawable-mdpi/ic_indicators_fluorescent.png
new file mode 100644
index 0000000..0f6b74f
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_fluorescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_incandescent.png b/res/drawable-mdpi/ic_indicators_incandescent.png
new file mode 100644
index 0000000..6042142
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_incandescent.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_landscape.png b/res/drawable-mdpi/ic_indicators_landscape.png
new file mode 100644
index 0000000..643ea7c
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_landscape.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-mdpi/ic_indicators_landscape_flash_auto.png
new file mode 100644
index 0000000..38ac3b1
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_landscape_flash_auto.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_landscape_flash_off.png b/res/drawable-mdpi/ic_indicators_landscape_flash_off.png
new file mode 100644
index 0000000..93cc249
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_landscape_flash_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_landscape_flash_on.png b/res/drawable-mdpi/ic_indicators_landscape_flash_on.png
new file mode 100644
index 0000000..c65dc71
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_landscape_flash_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_macro.png b/res/drawable-mdpi/ic_indicators_macro.png
new file mode 100644
index 0000000..f0ff4fe
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_macro.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_scn.png b/res/drawable-mdpi/ic_indicators_scn.png
new file mode 100644
index 0000000..5c152a8
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_scn.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_indicators_sunlight.png b/res/drawable-mdpi/ic_indicators_sunlight.png
new file mode 100644
index 0000000..59bce0f
--- /dev/null
+++ b/res/drawable-mdpi/ic_indicators_sunlight.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_cloudy.png b/res/drawable-sw600dp-hdpi/ic_indicators_cloudy.png
new file mode 100644
index 0000000..cafcff4
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_cloudy.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_fluorescent.png b/res/drawable-sw600dp-hdpi/ic_indicators_fluorescent.png
new file mode 100644
index 0000000..79ac9bb
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_fluorescent.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_incandescent.png b/res/drawable-sw600dp-hdpi/ic_indicators_incandescent.png
new file mode 100644
index 0000000..a1dae2a
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_incandescent.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_landscape.png b/res/drawable-sw600dp-hdpi/ic_indicators_landscape.png
new file mode 100644
index 0000000..4019661
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_landscape.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_auto.png
new file mode 100644
index 0000000..d571c0a
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_auto.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_off.png b/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_off.png
new file mode 100644
index 0000000..b5b7e7c
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_off.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_on.png b/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_on.png
new file mode 100644
index 0000000..28ce420
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_landscape_flash_on.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_macro.png b/res/drawable-sw600dp-hdpi/ic_indicators_macro.png
new file mode 100644
index 0000000..5770a45
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_macro.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_scn.png b/res/drawable-sw600dp-hdpi/ic_indicators_scn.png
new file mode 100644
index 0000000..e8b0129
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_scn.png
Binary files differ
diff --git a/res/drawable-sw600dp-hdpi/ic_indicators_sunlight.png b/res/drawable-sw600dp-hdpi/ic_indicators_sunlight.png
new file mode 100644
index 0000000..91abd26
--- /dev/null
+++ b/res/drawable-sw600dp-hdpi/ic_indicators_sunlight.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_cloudy.png b/res/drawable-sw600dp-mdpi/ic_indicators_cloudy.png
new file mode 100644
index 0000000..6b16cab
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_cloudy.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_fluorescent.png b/res/drawable-sw600dp-mdpi/ic_indicators_fluorescent.png
new file mode 100644
index 0000000..d7c23bc
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_fluorescent.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_incandescent.png b/res/drawable-sw600dp-mdpi/ic_indicators_incandescent.png
new file mode 100644
index 0000000..5e63b43
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_incandescent.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_landscape.png b/res/drawable-sw600dp-mdpi/ic_indicators_landscape.png
new file mode 100644
index 0000000..36a66f5
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_landscape.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_auto.png
new file mode 100644
index 0000000..95e410c
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_auto.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_off.png b/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_off.png
new file mode 100644
index 0000000..11ebc4f
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_off.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_on.png b/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_on.png
new file mode 100644
index 0000000..2cb4f15
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_landscape_flash_on.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_macro.png b/res/drawable-sw600dp-mdpi/ic_indicators_macro.png
new file mode 100644
index 0000000..61ec7a4
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_macro.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_scn.png b/res/drawable-sw600dp-mdpi/ic_indicators_scn.png
new file mode 100644
index 0000000..da55fdb
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_scn.png
Binary files differ
diff --git a/res/drawable-sw600dp-mdpi/ic_indicators_sunlight.png b/res/drawable-sw600dp-mdpi/ic_indicators_sunlight.png
new file mode 100644
index 0000000..4c8d29e
--- /dev/null
+++ b/res/drawable-sw600dp-mdpi/ic_indicators_sunlight.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_cloudy.png b/res/drawable-sw600dp-xhdpi/ic_indicators_cloudy.png
new file mode 100644
index 0000000..2fcd207
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_cloudy.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_fluorescent.png b/res/drawable-sw600dp-xhdpi/ic_indicators_fluorescent.png
new file mode 100644
index 0000000..6214325
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_fluorescent.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_incandescent.png b/res/drawable-sw600dp-xhdpi/ic_indicators_incandescent.png
new file mode 100644
index 0000000..dadc491
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_incandescent.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_landscape.png b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape.png
new file mode 100644
index 0000000..224a0c8
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_auto.png
new file mode 100644
index 0000000..4ac81d8
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_auto.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_off.png b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_off.png
new file mode 100644
index 0000000..86bf496
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_off.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_on.png b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_on.png
new file mode 100644
index 0000000..9bb5afa
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_landscape_flash_on.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_macro.png b/res/drawable-sw600dp-xhdpi/ic_indicators_macro.png
new file mode 100644
index 0000000..5c83fec
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_macro.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_scn.png b/res/drawable-sw600dp-xhdpi/ic_indicators_scn.png
new file mode 100644
index 0000000..0d145fb
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_scn.png
Binary files differ
diff --git a/res/drawable-sw600dp-xhdpi/ic_indicators_sunlight.png b/res/drawable-sw600dp-xhdpi/ic_indicators_sunlight.png
new file mode 100644
index 0000000..79a8e46
--- /dev/null
+++ b/res/drawable-sw600dp-xhdpi/ic_indicators_sunlight.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_cloudy.png b/res/drawable-xhdpi/ic_indicators_cloudy.png
new file mode 100644
index 0000000..a6d924b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_cloudy.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_fluorescent.png b/res/drawable-xhdpi/ic_indicators_fluorescent.png
new file mode 100644
index 0000000..012c67f
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_fluorescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_incandescent.png b/res/drawable-xhdpi/ic_indicators_incandescent.png
new file mode 100644
index 0000000..84bbd6a
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_incandescent.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_landscape.png b/res/drawable-xhdpi/ic_indicators_landscape.png
new file mode 100644
index 0000000..ebbcd67
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_landscape.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_landscape_flash_auto.png b/res/drawable-xhdpi/ic_indicators_landscape_flash_auto.png
new file mode 100644
index 0000000..654746b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_landscape_flash_auto.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_landscape_flash_off.png b/res/drawable-xhdpi/ic_indicators_landscape_flash_off.png
new file mode 100644
index 0000000..8edc075
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_landscape_flash_off.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_landscape_flash_on.png b/res/drawable-xhdpi/ic_indicators_landscape_flash_on.png
new file mode 100644
index 0000000..7f33bd5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_landscape_flash_on.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_macro.png b/res/drawable-xhdpi/ic_indicators_macro.png
new file mode 100644
index 0000000..7d34b85
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_macro.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_scn.png b/res/drawable-xhdpi/ic_indicators_scn.png
new file mode 100644
index 0000000..fafc0bc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_scn.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_indicators_sunlight.png b/res/drawable-xhdpi/ic_indicators_sunlight.png
new file mode 100644
index 0000000..71a0f68
--- /dev/null
+++ b/res/drawable-xhdpi/ic_indicators_sunlight.png
Binary files differ
diff --git a/res/layout-w1024dp/priority_indicators.xml b/res/layout-sw600dp/priority_indicators.xml
index 4926484..77067b0 100644
--- a/res/layout-w1024dp/priority_indicators.xml
+++ b/res/layout-sw600dp/priority_indicators.xml
@@ -20,15 +20,21 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp">
- <ImageView style="@style/OnScreenIndicator"
- android:id="@+id/onscreen_gps_indicator_no_signal"
- android:src="@drawable/ic_viewfinder_gps_no_signal"/>
- <ImageView style="@style/OnScreenIndicator"
- android:id="@+id/onscreen_gps_indicator_on"
- android:src="@drawable/ic_viewfinder_gps_on"/>
- <TextView style="@style/OnScreenIndicator"
- android:id="@+id/onscreen_exposure_indicator"
+ <ImageView android:id="@+id/onscreen_flash_indicator"
+ style="@style/OnScreenIndicator"
+ android:visibility="visible"/>
+ <ImageView android:id="@+id/onscreen_white_balance_indicator"
+ style="@style/OnScreenIndicator"/>
+ <TextView android:id="@+id/onscreen_exposure_indicator"
+ style="@style/OnScreenIndicator"
android:gravity="center_vertical"
android:textSize="15dp"
android:textColor="@android:color/white"/>
+ <ImageView android:id="@+id/onscreen_scene_indicator"
+ style="@style/OnScreenIndicator"
+ android:src="@drawable/ic_indicators_scn"/>
+ <ImageView android:id="@+id/onscreen_gps_indicator"
+ style="@style/OnScreenIndicator"/>
+ <ImageView android:id="@+id/onscreen_focus_indicator"
+ style="@style/OnScreenIndicator"/>
</LinearLayout>
diff --git a/res/layout/priority_indicators.xml b/res/layout/priority_indicators.xml
index 794dfb8..a8318e0 100644
--- a/res/layout/priority_indicators.xml
+++ b/res/layout/priority_indicators.xml
@@ -20,19 +20,23 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="8dp">
- <ImageView style="@style/OnScreenIndicator"
- android:padding="1dp"
- android:id="@+id/onscreen_gps_indicator_no_signal"
- android:src="@drawable/ic_viewfinder_gps_no_signal"/>
- <ImageView style="@style/OnScreenIndicator"
- android:padding="1dp"
- android:id="@+id/onscreen_gps_indicator_on"
- android:src="@drawable/ic_viewfinder_gps_on"/>
- <TextView style="@style/OnScreenIndicator"
- android:id="@+id/onscreen_exposure_indicator"
+ <ImageView android:id="@+id/onscreen_flash_indicator"
+ style="@style/OnScreenIndicator"
+ android:visibility="visible"/>
+ <ImageView android:id="@+id/onscreen_white_balance_indicator"
+ style="@style/OnScreenIndicator"/>
+ <TextView android:id="@+id/onscreen_exposure_indicator"
+ style="@style/OnScreenIndicator"
android:layout_marginTop="6dp"
- android:rotation="90.0"
+ android:layout_marginBottom="6dp"
android:gravity="center_vertical"
android:textSize="15dp"
android:textColor="@android:color/white"/>
+ <ImageView android:id="@+id/onscreen_scene_indicator"
+ style="@style/OnScreenIndicator"
+ android:src="@drawable/ic_indicators_scn"/>
+ <ImageView android:id="@+id/onscreen_gps_indicator"
+ style="@style/OnScreenIndicator"/>
+ <ImageView android:id="@+id/onscreen_focus_indicator"
+ style="@style/OnScreenIndicator"/>
</LinearLayout>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 65d3683..6b7427f 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -43,6 +43,14 @@
<item name="android:textSize">12sp</item>
<item name="android:textStyle">bold</item>
</style>
+ <style name="OnScreenIndicator">
+ <item name="android:layout_height">28dp</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:focusable">false</item>
+ <item name="android:visibility">gone</item>
+ <item name="android:layout_marginRight">8dp</item>
+ </style>
<style name="ReviewThumbnail">
<item name="android:layout_width">86dp</item>
<item name="android:layout_height">86dp</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 79cc759..53e7a1c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -141,10 +141,11 @@
<style name="OnScreenIndicator">
<item name="android:layout_height">28dp</item>
<item name="android:layout_width">wrap_content</item>
- <item name="android:layout_gravity">center_vertical</item>
+ <item name="android:layout_gravity">center_horizontal</item>
<item name="android:focusable">false</item>
<item name="android:visibility">gone</item>
- <item name="android:layout_marginRight">8dp</item>
+ <item name="android:rotation">90</item>
+ <item name="android:padding">1dp</item>
</style>
<style name="ViewfinderLableLayout">
<item name="android:layout_width">match_parent</item>