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/video_camera.xml | |
| 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/video_camera.xml')
| -rw-r--r-- | res/layout/video_camera.xml | 3 |
1 files changed, 1 insertions, 2 deletions
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"/> |