diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/camera.xml | 49 | ||||
| -rw-r--r-- | res/layout/video_camera.xml | 3 | ||||
| -rw-r--r-- | res/values/arrays.xml | 10 | ||||
| -rw-r--r-- | res/values/styles.xml | 7 |
4 files changed, 33 insertions, 36 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index b9530e6..e6b3b47 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -40,50 +40,41 @@ android:id="@+id/focus_rectangle" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <com.android.camera.EvenlySpacedLayout android:id="@+id/indicator_bar" - camera:orientation="vertical" + <LinearLayout android:id="@+id/indicator_bar" + android:orientation="vertical" android:visibility="visible" - android:layout_gravity="left|fill_vertical" - android:layout_marginTop="20dp" + android:gravity="center" + android:layout_gravity="left|top" + android:layout_marginTop="10dp" android:layout_marginLeft="10dp" android:layout_width="wrap_content" - android:layout_height="fill_parent"> + android:layout_height="wrap_content"> <com.android.camera.IconIndicator - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/IconIndicator" android:id="@+id/gps_icon" camera:modes="@array/gps_modes" - camera:icons="@array/gps_icons" - android:visibility="visible"/> + camera:icons="@array/gps_icons"/> <com.android.camera.IconIndicator - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/IconIndicator" + android:id="@+id/scenemode_icon" + camera:modes="@array/scenemode_modes" + camera:icons="@array/scenemode_icons"/> + <com.android.camera.IconIndicator + style="@style/IconIndicator" android:id="@+id/focus_icon" camera:modes="@array/pref_camera_focusmode_entryvalues" - camera:icons="@array/focusmode_icons" - android:visibility="visible"/> + camera:icons="@array/focusmode_icons"/> <com.android.camera.IconIndicator - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/IconIndicator" android:id="@+id/whitebalance_icon" camera:modes="@array/pref_camera_whitebalance_entryvalues" - 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/scenemode_icon" - camera:modes="@array/scenemode_modes" - camera:icons="@array/scenemode_icons" - android:visibility="visible"/> + camera:icons="@array/whitebalance_icons"/> <com.android.camera.IconIndicator - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/IconIndicator" android:id="@+id/flash_icon" camera:modes="@array/flash_modes" - camera:icons="@array/flash_icons" - android:visibility="visible"/> - </com.android.camera.EvenlySpacedLayout> + camera:icons="@array/flash_icons"/> + </LinearLayout> </FrameLayout> </com.android.camera.PreviewFrameLayout> </LinearLayout> diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index 9ebdc03..b6717d8 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -71,8 +71,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> <com.android.camera.IconIndicator - android:layout_width="wrap_content" - android:layout_height="wrap_content" + style="@style/IconIndicator" android:id="@+id/whitebalance_icon" camera:modes="@array/pref_camera_whitebalance_entryvalues" camera:icons="@array/whitebalance_icons"/> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 89f959f..746f015 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -100,7 +100,7 @@ </array> <array name="focusmode_icons"> - <item>@drawable/ic_viewfinder_empty</item> + <item>@null</item> <item>@drawable/ic_viewfinder_focus_infinity</item> <item>@drawable/ic_viewfinder_focus_macro</item> </array> @@ -145,7 +145,7 @@ <item>@drawable/ic_viewfinder_flash_auto</item> <item>@drawable/ic_viewfinder_flash_on</item> <item>@drawable/ic_viewfinder_flash_off</item> - <item>@drawable/ic_viewfinder_empty</item> + <item>@null</item> </array> <string-array name="gps_modes" translatable="false"> @@ -154,7 +154,7 @@ </string-array> <array name="gps_icons"> - <item>0</item> + <item>@null</item> <item>@drawable/ic_camera_sym_gps</item> </array> @@ -184,7 +184,7 @@ </array> <array name="whitebalance_icons"> - <item>@drawable/ic_viewfinder_empty</item> + <item>@null</item> <item>@drawable/ic_viewfinder_wb_incandescent</item> <item>@drawable/ic_viewfinder_wb_daylight</item> <item>@drawable/ic_viewfinder_wb_fluorescent</item> @@ -259,7 +259,7 @@ </string-array> <array name="scenemode_icons"> - <item>@drawable/ic_viewfinder_empty</item> + <item>@null</item> <item>@drawable/ic_viewfinder_scenemode</item> </array> diff --git a/res/values/styles.xml b/res/values/styles.xml index 4a79fe5..04bd634 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -61,6 +61,13 @@ <item name="android:windowEnterAnimation">@null</item> <item name="android:windowExitAnimation">@null</item> </style> + <style name="IconIndicator"> + <item name="android:visibility">gone</item> + <item name="android:layout_marginTop">10dp</item> + <item name="android:layout_marginBottom">10dp</item> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + </style> <style name="CustomTheme" parent="@android:style/Theme.Black.NoTitleBar.Fullscreen"> <item name="android:windowAnimationStyle">@style/NoEnterExitAnimation</item> |