diff options
| author | Cheng-Ru Lin <owenlin@google.com> | 2009-11-11 23:31:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 23:31:39 -0800 |
| commit | ea0e1e148604b13dd43f27670ec128d61858c772 (patch) | |
| tree | 280b4a364760c71062915ac002319145b46f14ac /res | |
| parent | 86e17ac861c2b8566d73ec879e070bafac0b8c8b (diff) | |
| parent | 1bd992a9bad59e6b1b935d5c1caa9747ba40c11e (diff) | |
| download | LegacyCamera-ea0e1e148604b13dd43f27670ec128d61858c772.zip LegacyCamera-ea0e1e148604b13dd43f27670ec128d61858c772.tar.gz LegacyCamera-ea0e1e148604b13dd43f27670ec128d61858c772.tar.bz2 | |
am 1bd992a9: am fb4f6c79: am cc12a303: Add icon-indicators to VideoCamera.
Merge commit '1bd992a9bad59e6b1b935d5c1caa9747ba40c11e'
* commit '1bd992a9bad59e6b1b935d5c1caa9747ba40c11e':
Add icon-indicators to VideoCamera.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/video_camera.xml | 20 | ||||
| -rw-r--r-- | res/xml/video_preferences.xml | 6 |
2 files changed, 22 insertions, 4 deletions
diff --git a/res/layout/video_camera.xml b/res/layout/video_camera.xml index b165d90..9ebdc03 100644 --- a/res/layout/video_camera.xml +++ b/res/layout/video_camera.xml @@ -15,6 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" android:id="@+id/video_camera" android:background="@drawable/camera_background" android:orientation="horizontal" @@ -35,8 +36,7 @@ <SurfaceView android:id="@+id/camera_preview" android:layout_width="fill_parent" android:layout_height="fill_parent"/> - <ImageView - android:id="@+id/video_frame" + <ImageView android:id="@+id/video_frame" android:layout_width="fill_parent" android:layout_height="fill_parent" android:visibility="gone" /> @@ -61,6 +61,22 @@ android:textSize="23dp" android:textStyle="bold" android:visibility="gone"/> + <LinearLayout android:id="@+id/indicator_bar" + android:orientation="vertical" + android:visibility="visible" + android:gravity="center" + android:layout_gravity="left|bottom" + android:layout_marginBottom="60dp" + android:layout_marginLeft="13dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <com.android.camera.IconIndicator + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/whitebalance_icon" + camera:modes="@array/pref_camera_whitebalance_entryvalues" + camera:icons="@array/whitebalance_icons"/> + </LinearLayout> </FrameLayout> </com.android.camera.PreviewFrameLayout> </LinearLayout> diff --git a/res/xml/video_preferences.xml b/res/xml/video_preferences.xml index 3617f79..105d1fc 100644 --- a/res/xml/video_preferences.xml +++ b/res/xml/video_preferences.xml @@ -14,7 +14,8 @@ limitations under the License. --> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:camera="http://schemas.android.com/apk/res/com.android.camera"> <PreferenceCategory android:title="@string/pref_camcorder_settings_category"> <ListPreference @@ -31,10 +32,11 @@ android:entries="@array/pref_camera_video_duration_entries" android:entryValues="@array/pref_camera_video_duration_entryvalues" android:dialogTitle="@string/pref_camera_video_duration_dialogtitle" /> - <ListPreference + <com.android.camera.IconListPreference android:key="pref_camera_whitebalance_key" android:defaultValue="@string/pref_camera_whitebalance_default" android:title="@string/pref_camera_whitebalance_title" + camera:icons="@array/pref_camera_whitebalance_icons" android:entries="@array/pref_camera_whitebalance_entries" android:entryValues="@array/pref_camera_whitebalance_entryvalues" android:dialogTitle="@string/pref_camera_whitebalance_dialogtitle" /> |