diff options
| author | Owen Lin <owenlin@google.com> | 2009-11-20 11:24:05 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2009-11-20 11:24:05 +0800 |
| commit | 471fd0aa7dccebe4ac63e8202ee9227ccb52c83d (patch) | |
| tree | 0bcb5e49816728306362956ff5edfa144ff72d75 /res/layout | |
| parent | e1706c13d469a163d811e29d33b86cc5d4bf67e9 (diff) | |
| parent | 503560f0dc42d6185c61be06f8060dfd50d30d69 (diff) | |
| download | LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.zip LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.tar.gz LegacyCamera-471fd0aa7dccebe4ac63e8202ee9227ccb52c83d.tar.bz2 | |
resolved conflicts for merge of 503560f0 to eclair-mr2
Change-Id: I9516a46bf0602cdff0128bf36d4e8dfb6ddd3823
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 e6b3b47..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/flash_modes" - 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> |