diff options
| author | Owen Lin <owenlin@google.com> | 2009-11-19 13:24:55 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2009-11-20 11:00:22 +0800 |
| commit | 503560f0dc42d6185c61be06f8060dfd50d30d69 (patch) | |
| tree | 8c6a10f96c8a3d5b455cb8b86e94a7709aca4630 /res/layout | |
| parent | 3e44f8076a16792bb295589ca4b467ba27ea2a6f (diff) | |
| download | LegacyCamera-503560f0dc42d6185c61be06f8060dfd50d30d69.zip LegacyCamera-503560f0dc42d6185c61be06f8060dfd50d30d69.tar.gz LegacyCamera-503560f0dc42d6185c61be06f8060dfd50d30d69.tar.bz2 | |
Keep space for those empty icons but hide them if the feature is not
supported.
fix bug: http://b/2250438
Change-Id: I79eb9d575cf275c25decc6236b80f61ecfdf3042
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera.xml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/res/layout/camera.xml b/res/layout/camera.xml index b35761c..199208f 100644 --- a/res/layout/camera.xml +++ b/res/layout/camera.xml @@ -49,6 +49,8 @@ android:layout_marginLeft="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content"> + <!-- Thsee icons should be in the same order as the + on-screen menu items --> <com.android.camera.IconIndicator style="@style/IconIndicator" android:id="@+id/gps_icon" @@ -56,24 +58,24 @@ camera:icons="@array/gps_icons"/> <com.android.camera.IconIndicator style="@style/IconIndicator" + android:id="@+id/flash_icon" + camera:modes="@array/flash_modes" + camera:icons="@array/flash_icons"/> + <com.android.camera.IconIndicator + 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"/> - <com.android.camera.IconIndicator - style="@style/IconIndicator" android:id="@+id/whitebalance_icon" camera:modes="@array/pref_camera_whitebalance_entryvalues" camera:icons="@array/whitebalance_icons"/> <com.android.camera.IconIndicator style="@style/IconIndicator" - android:id="@+id/flash_icon" - camera:modes="@array/pref_camera_flashmode_entryvalues" - camera:icons="@array/flash_icons"/> + android:id="@+id/focus_icon" + camera:modes="@array/pref_camera_focusmode_entryvalues" + camera:icons="@array/focusmode_icons"/> </LinearLayout> </FrameLayout> </com.android.camera.PreviewFrameLayout> |