diff options
| author | Owen Lin <owenlin@google.com> | 2009-11-16 13:25:23 +0800 |
|---|---|---|
| committer | Owen Lin <owenlin@google.com> | 2009-11-16 13:25:23 +0800 |
| commit | ea7c3e6a714c6c34c0fa7c06513bbdd69d39f8f7 (patch) | |
| tree | 42612b9b50105852191fd5604a5db3e42f04c940 /res/layout | |
| parent | 6dfb8f96124a4c97b3cd964a9e9feb3587d32663 (diff) | |
| parent | 4d55cb369de5933025af40bece5e08830aae935e (diff) | |
| download | LegacyCamera-ea7c3e6a714c6c34c0fa7c06513bbdd69d39f8f7.zip LegacyCamera-ea7c3e6a714c6c34c0fa7c06513bbdd69d39f8f7.tar.gz LegacyCamera-ea7c3e6a714c6c34c0fa7c06513bbdd69d39f8f7.tar.bz2 | |
resolved conflicts for merge of 4d55cb36 to eclair-mr2
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera.xml | 49 | ||||
| -rw-r--r-- | res/layout/video_camera.xml | 3 |
2 files changed, 21 insertions, 31 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"/> |