summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/bg_replacement_training_message.xml56
-rw-r--r--res/layout/camera_main.xml30
-rw-r--r--res/layout/count_down_to_capture.xml35
-rw-r--r--res/layout/effect_setting_item.xml29
-rw-r--r--res/layout/effect_setting_popup.xml68
-rw-r--r--res/layout/face_view.xml19
-rw-r--r--res/layout/in_line_setting_check_box.xml31
-rw-r--r--res/layout/in_line_setting_menu.xml27
-rw-r--r--res/layout/list_pref_setting_popup.xml41
-rw-r--r--res/layout/menu_indicators.xml50
-rw-r--r--res/layout/menu_indicators_keyguard.xml50
-rw-r--r--res/layout/more_setting_popup.xml26
-rw-r--r--res/layout/panorama_module.xml23
-rw-r--r--res/layout/photo_module.xml29
-rw-r--r--res/layout/preview_module_frame.xml43
-rw-r--r--res/layout/preview_module_frame_video.xml60
-rw-r--r--res/layout/preview_surface_view.xml20
-rw-r--r--res/layout/rotate_dialog.xml110
-rw-r--r--res/layout/rotate_text_toast.xml39
-rw-r--r--res/layout/setting_item.xml27
-rw-r--r--res/layout/time_interval_picker.xml65
-rw-r--r--res/layout/time_interval_popup.xml87
-rw-r--r--res/layout/timer_setting_popup.xml101
-rw-r--r--res/layout/viewfinder_labels_video.xml31
24 files changed, 1097 insertions, 0 deletions
diff --git a/res/layout/bg_replacement_training_message.xml b/res/layout/bg_replacement_training_message.xml
new file mode 100644
index 000000000..8d881d64e
--- /dev/null
+++ b/res/layout/bg_replacement_training_message.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/bg_replace_message_frame"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:visibility="gone"
+ android:onClick="onProtectiveCurtainClick"
+ android:background="#77000000">
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/bg_replace_message"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_centerInParent="true">
+ <LinearLayout
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:orientation="vertical"
+ android:background="@drawable/dialog_full_holo_dark">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/bg_replacement_message"
+ android:padding="32dp" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#aaaaaa" />
+
+ <Button android:layout_width="match_parent"
+ android:layout_height="48dip"
+ android:layout_gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ style="?android:attr/borderlessButtonStyle"
+ android:text="@android:string/cancel"
+ android:onClick="onCancelBgTraining"
+ android:contentDescription="@android:string/cancel" />
+ </LinearLayout>
+ </com.android.camera.ui.RotateLayout>
+</RelativeLayout>
diff --git a/res/layout/camera_main.xml b/res/layout/camera_main.xml
new file mode 100644
index 000000000..f5240feed
--- /dev/null
+++ b/res/layout/camera_main.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <include layout="@layout/gl_root_group" />
+
+ <FrameLayout
+ android:id="@+id/main_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <include layout="@layout/camera_shutter_switcher" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/count_down_to_capture.xml b/res/layout/count_down_to_capture.xml
new file mode 100644
index 000000000..68276ad40
--- /dev/null
+++ b/res/layout/count_down_to_capture.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ui.CountDownView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/count_down_to_capture"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="invisible" >
+ <TextView android:id="@+id/remaining_seconds"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textSize="160sp"
+ android:textColor="@android:color/white"
+ android:gravity="center" />
+ <TextView android:id="@+id/count_down_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dp"
+ android:paddingTop="20dp"
+ android:textSize="20sp"
+ android:textColor="@android:color/white"
+ android:text="@string/count_down_title_text" />
+</com.android.camera.ui.CountDownView> \ No newline at end of file
diff --git a/res/layout/effect_setting_item.xml b/res/layout/effect_setting_item.xml
new file mode 100644
index 000000000..655625c18
--- /dev/null
+++ b/res/layout/effect_setting_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="UseCompoundDrawables"
+ style="@style/EffectSettingItem">
+
+ <ImageView android:id="@+id/image"
+ android:layout_height="@dimen/effect_setting_item_icon_width"
+ android:layout_width="@dimen/effect_setting_item_icon_width"
+ android:layout_gravity="center_horizontal"
+ android:scaleType="fitCenter"
+ android:adjustViewBounds="true" />
+ <TextView android:id="@+id/text"
+ style="@style/EffectSettingItemTitle"/>
+</LinearLayout>
diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml
new file mode 100644
index 000000000..63b7ab458
--- /dev/null
+++ b/res/layout/effect_setting_popup.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ui.EffectSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SettingPopupWindow">
+ <LinearLayout android:orientation="vertical"
+ android:background="@color/popup_background"
+ android:layout_height="wrap_content"
+ android:layout_width="@dimen/big_setting_popup_window_width">
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/popup_title_frame_min_height">
+ <TextView android:id="@+id/title"
+ style="@style/PopupTitleText" />
+ </FrameLayout>
+ <View style="@style/PopupTitleSeparator" />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <TextView android:id="@+id/clear_effects"
+ android:text="@string/clear_effects"
+ style="@style/EffectSettingTypeTitle"
+ android:textSize="@dimen/effect_setting_clear_text_size"
+ android:minHeight="@dimen/effect_setting_clear_text_min_height"
+ android:background="@drawable/bg_pressed"/>
+ <TextView android:id="@+id/effect_silly_faces_title"
+ android:text="@string/effect_silly_faces"
+ android:visibility="gone"
+ style="@style/EffectSettingTypeTitle"/>
+ <View android:id="@+id/effect_silly_faces_title_separator"
+ android:visibility="gone"
+ style="@style/EffectTypeSeparator"/>
+ <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_silly_faces"
+ style="@style/EffectSettingGrid"/>
+ <View android:id="@+id/effect_background_separator"
+ android:visibility="gone"
+ style="@style/EffectTitleSeparator"/>
+ <TextView android:id="@+id/effect_background_title"
+ android:text="@string/effect_background"
+ android:visibility="gone"
+ style="@style/EffectSettingTypeTitle"/>
+ <View android:id="@+id/effect_background_title_separator"
+ android:visibility="gone"
+ style="@style/EffectTypeSeparator"/>
+ <com.android.camera.ui.ExpandedGridView android:id="@+id/effect_background"
+ android:visibility="gone"
+ style="@style/EffectSettingGrid"/>
+ </LinearLayout>
+ </ScrollView>
+ </LinearLayout>
+</com.android.camera.ui.EffectSettingPopup>
diff --git a/res/layout/face_view.xml b/res/layout/face_view.xml
new file mode 100644
index 000000000..63e78860b
--- /dev/null
+++ b/res/layout/face_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2012, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ui.FaceView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"/>
diff --git a/res/layout/in_line_setting_check_box.xml b/res/layout/in_line_setting_check_box.xml
new file mode 100644
index 000000000..a4d9bba21
--- /dev/null
+++ b/res/layout/in_line_setting_check_box.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.InLineSettingCheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SettingRow">
+ <TextView android:id="@+id/title"
+ style="@style/SettingItemTitle" />
+
+ <!-- The Switch widget always aligns to the right, so we have to wrap it in a frame layout. -->
+ <FrameLayout
+ android:layout_width="@dimen/setting_item_text_width"
+ android:layout_height="match_parent">
+ <CheckBox android:id="@+id/setting_check_box"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" />
+ </FrameLayout>
+</com.android.camera.ui.InLineSettingCheckBox>
diff --git a/res/layout/in_line_setting_menu.xml b/res/layout/in_line_setting_menu.xml
new file mode 100644
index 000000000..f45f10ff7
--- /dev/null
+++ b/res/layout/in_line_setting_menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.InLineSettingMenu xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SettingRow"
+ android:background="@drawable/bg_pressed_exit_fading">
+ <TextView android:id="@+id/title"
+ style="@style/SettingItemTitle" />
+
+ <TextView android:id="@+id/current_setting"
+ style="@style/SettingItemText" />
+
+</com.android.camera.ui.InLineSettingMenu>
+
diff --git a/res/layout/list_pref_setting_popup.xml b/res/layout/list_pref_setting_popup.xml
new file mode 100644
index 000000000..5bfaa52e6
--- /dev/null
+++ b/res/layout/list_pref_setting_popup.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2011, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ui.ListPrefSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SettingPopupWindow">
+
+ <LinearLayout android:orientation="vertical"
+ android:background="@color/popup_background"
+ android:layout_height="wrap_content"
+ android:layout_width="@dimen/setting_popup_window_width">
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/popup_title_frame_min_height">
+ <TextView android:id="@+id/title"
+ style="@style/PopupTitleText" />
+ </FrameLayout>
+
+ <View style="@style/PopupTitleSeparator" />
+
+ <FrameLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+ <ListView android:id="@+id/settingList"
+ style="@style/SettingItemList"
+ android:choiceMode="singleChoice" />
+ </FrameLayout>
+ </LinearLayout>
+</com.android.camera.ui.ListPrefSettingPopup>
diff --git a/res/layout/menu_indicators.xml b/res/layout/menu_indicators.xml
new file mode 100644
index 000000000..08e04659d
--- /dev/null
+++ b/res/layout/menu_indicators.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/on_screen_indicators"
+ android:layout_width="80dip"
+ android:layout_height="80dip" >
+
+ <ImageView
+ android:id="@+id/menu_hdr_indicator"
+ style="@style/MenuIndicator"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:src="@drawable/ic_indicator_hdr_off" />
+
+ <ImageView
+ android:id="@+id/menu_flash_indicator"
+ style="@style/MenuIndicator"
+ android:layout_toRightOf="@id/menu_hdr_indicator"
+ android:layout_alignTop="@id/menu_hdr_indicator"
+ android:src="@drawable/ic_indicator_flash_off" />
+
+ <ImageView
+ android:id="@+id/menu_exposure_indicator"
+ style="@style/MenuIndicator"
+ android:layout_below="@id/menu_hdr_indicator"
+ android:layout_alignLeft="@id/menu_hdr_indicator"
+ android:layout_alignParentLeft="true"
+ android:src="@drawable/ic_indicator_ev_0" />
+
+ <ImageView
+ android:id="@+id/menu_scenemode_indicator"
+ style="@style/MenuIndicator"
+ android:layout_alignTop="@id/menu_exposure_indicator"
+ android:layout_toRightOf="@id/menu_exposure_indicator"
+ android:src="@drawable/ic_indicator_sce_off" />
+
+</RelativeLayout>
diff --git a/res/layout/menu_indicators_keyguard.xml b/res/layout/menu_indicators_keyguard.xml
new file mode 100644
index 000000000..6c838f6c5
--- /dev/null
+++ b/res/layout/menu_indicators_keyguard.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/on_screen_indicators"
+ android:layout_width="80dip"
+ android:layout_height="80dip" >
+
+ <ImageView
+ android:id="@+id/menu_hdr_indicator"
+ style="@style/MenuIndicator"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:src="@drawable/ic_indicator_hdr_off" />
+
+ <ImageView
+ android:id="@+id/menu_flash_indicator"
+ style="@style/MenuIndicator"
+ android:layout_toRightOf="@id/menu_hdr_indicator"
+ android:layout_alignTop="@id/menu_hdr_indicator"
+ android:src="@drawable/ic_indicator_flash_auto" />
+
+ <ImageView
+ android:id="@+id/menu_exposure_indicator"
+ style="@style/MenuIndicator"
+ android:layout_below="@id/menu_hdr_indicator"
+ android:layout_alignLeft="@id/menu_hdr_indicator"
+ android:layout_alignParentLeft="true"
+ android:src="@drawable/ic_indicator_ev_0" />
+
+ <ImageView
+ android:id="@+id/menu_scenemode_indicator"
+ style="@style/MenuIndicator"
+ android:layout_alignTop="@id/menu_exposure_indicator"
+ android:layout_toRightOf="@id/menu_exposure_indicator"
+ android:src="@drawable/ic_indicator_sce_off" />
+
+</RelativeLayout>
diff --git a/res/layout/more_setting_popup.xml b/res/layout/more_setting_popup.xml
new file mode 100644
index 000000000..3ccde856c
--- /dev/null
+++ b/res/layout/more_setting_popup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2010, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ui.MoreSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SettingPopupWindow">
+
+ <FrameLayout
+ android:background="@color/popup_background"
+ android:layout_width="@dimen/big_setting_popup_window_width"
+ android:layout_height="wrap_content">
+ <ListView android:id="@+id/settingList"
+ style="@style/SettingItemList" />
+ </FrameLayout>
+</com.android.camera.ui.MoreSettingPopup>
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml
new file mode 100644
index 000000000..901bb6b7a
--- /dev/null
+++ b/res/layout/panorama_module.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/pano_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <include layout="@layout/pano_module_capture" />
+ <include layout="@layout/pano_review" />
+</RelativeLayout>
diff --git a/res/layout/photo_module.xml b/res/layout/photo_module.xml
new file mode 100644
index 000000000..b2ad7028f
--- /dev/null
+++ b/res/layout/photo_module.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This layout is shared by phone and tablet in both landscape and portrait
+ orientation. The purpose of having this layout is to eventually not manually
+ recreate views when the orientation changes, by migrating the views that do not
+ need to be recreated in onConfigurationChanged from old photo_module to this
+ layout. -->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/camera_app_root"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <include layout="@layout/count_down_to_capture"/>
+ <include layout="@layout/photo_module_content"/>
+</FrameLayout> \ No newline at end of file
diff --git a/res/layout/preview_module_frame.xml b/res/layout/preview_module_frame.xml
new file mode 100644
index 000000000..66094c9b7
--- /dev/null
+++ b/res/layout/preview_module_frame.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/frame_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1">
+ <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
+ android:layout_centerInParent="true"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <include layout="@layout/preview_surface_view"/>
+ <ViewStub android:id="@+id/face_view_stub"
+ android:inflatedId="@+id/face_view"
+ android:layout="@layout/face_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"/>
+ <com.android.camera.ui.RenderOverlay
+ android:id="@+id/render_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ </com.android.camera.PreviewFrameLayout>
+ <ImageView android:id="@+id/capture_anim_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layerType="hardware"
+ android:visibility="gone"/>
+</RelativeLayout>
diff --git a/res/layout/preview_module_frame_video.xml b/res/layout/preview_module_frame_video.xml
new file mode 100644
index 000000000..3418faf19
--- /dev/null
+++ b/res/layout/preview_module_frame_video.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/frame_layout"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_weight="1">
+ <com.android.camera.PreviewFrameLayout android:id="@+id/frame"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:layout_centerInParent="true">
+ <include layout="@layout/preview_surface_view"/>
+ <FrameLayout android:id="@+id/preview_border"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ android:background="@drawable/ic_snapshot_border" />
+ <com.android.camera.ui.RenderOverlay
+ android:id="@+id/render_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+ <com.android.camera.ui.RotateLayout android:id="@+id/recording_time_rect"
+ style="@style/ViewfinderLabelLayout">
+ <include layout="@layout/viewfinder_labels_video" android:id="@+id/labels" />
+ </com.android.camera.ui.RotateLayout>
+ <ImageView android:id="@+id/review_image"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:visibility="gone"
+ android:background="@android:color/black"/>
+ <com.android.camera.ui.RotateImageView
+ android:id="@+id/btn_play"
+ style="@style/ReviewControlIcon"
+ android:layout_centerInParent="true"
+ android:src="@drawable/ic_gallery_play_big"
+ android:visibility="gone"
+ android:onClick="onReviewPlayClicked"/>
+ </com.android.camera.PreviewFrameLayout>
+
+ <ImageView android:id="@+id/capture_anim_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layerType="hardware"
+ android:visibility="gone"/>
+
+</RelativeLayout>
+
diff --git a/res/layout/preview_surface_view.xml b/res/layout/preview_surface_view.xml
new file mode 100644
index 000000000..cdaf0eea9
--- /dev/null
+++ b/res/layout/preview_surface_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2012, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ui.PreviewSurfaceView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/preview_surface_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"/>
diff --git a/res/layout/rotate_dialog.xml b/res/layout/rotate_dialog.xml
new file mode 100644
index 000000000..c62ce915b
--- /dev/null
+++ b/res/layout/rotate_dialog.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/rotate_dialog_root_layout"
+ android:clickable="true"
+ android:gravity="center"
+ android:visibility="gone"
+ android:background="#55000000"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <com.android.camera.ui.RotateLayout
+ android:id="@+id/rotate_dialog_layout"
+ android:gravity="center"
+ android:layout_gravity="center"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" >
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_gravity="center"
+ android:background="@color/popup_background"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <LinearLayout android:id="@+id/rotate_dialog_title_layout"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/rotate_dialog_title"
+ style="@style/TextAppearance.DialogWindowTitle"
+ android:gravity="center_vertical"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="64dp"/>
+ <View style="@style/PopupTitleSeparator" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:background="@color/popup_background"
+ android:padding="9dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <ProgressBar
+ android:id="@+id/rotate_dialog_spinner"
+ android:layout_gravity="center_vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <TextView
+ style="@style/TextAppearance.Medium"
+ android:id="@+id/rotate_dialog_text"
+ android:layout_gravity="center_vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ <ImageView android:background="@drawable/list_divider"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <LinearLayout android:id="@+id/rotate_dialog_button_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:minHeight="48dp"
+ android:orientation="horizontal">
+
+ <Button android:id="@+id/rotate_dialog_button2"
+ style="@style/Widget.Button.Borderless"
+ android:gravity="center"
+ android:maxLines="2"
+ android:minHeight="48dp"
+ android:textSize="14sp"
+ android:layout_weight="1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content" />
+ <ImageView android:background="@drawable/list_divider"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent" />
+ <Button android:id="@+id/rotate_dialog_button1"
+ style="@style/Widget.Button.Borderless"
+ android:gravity="center"
+ android:maxLines="2"
+ android:minHeight="48dp"
+ android:textSize="14sp"
+ android:layout_weight="1"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+ </LinearLayout>
+ </com.android.camera.ui.RotateLayout>
+</FrameLayout>
diff --git a/res/layout/rotate_text_toast.xml b/res/layout/rotate_text_toast.xml
new file mode 100644
index 000000000..2c89b6f59
--- /dev/null
+++ b/res/layout/rotate_text_toast.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.RotateLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/rotate_toast"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:visibility="gone">
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/toast_frame_holo">
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:textColor="@android:color/white"
+ android:shadowColor="#BB000000"
+ android:shadowRadius="2.75" />
+ </FrameLayout>
+</com.android.camera.ui.RotateLayout>
+
+
diff --git a/res/layout/setting_item.xml b/res/layout/setting_item.xml
new file mode 100644
index 000000000..857100362
--- /dev/null
+++ b/res/layout/setting_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2011, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.android.camera.ui.CheckedLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ tools:ignore="UseCompoundDrawables"
+ style="@style/SettingRow">
+ <TextView android:id="@+id/text"
+ style="@style/SettingItemTitle" />
+ <ImageView android:id="@+id/image"
+ android:layout_height="@dimen/setting_item_icon_width"
+ android:layout_width="@dimen/setting_item_icon_width"
+ android:scaleType="fitCenter"
+ android:adjustViewBounds="true" />
+</com.android.camera.ui.CheckedLinearLayout>
diff --git a/res/layout/time_interval_picker.xml b/res/layout/time_interval_picker.xml
new file mode 100644
index 000000000..d2a946273
--- /dev/null
+++ b/res/layout/time_interval_picker.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2012, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Layout of time interval picker -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/time_interval_picker"
+ android:orientation="vertical"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/set_time_interval_title"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="5dip"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/set_time_interval"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip" >
+
+ <!-- time interval duration -->
+ <NumberPicker
+ android:id="@+id/duration"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:focusable="false" />
+
+ <!-- time interval duration units (seconds/minutes/hours) -->
+ <NumberPicker
+ android:id="@+id/duration_unit"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:layout_marginLeft="20dip"
+ android:focusable="false" />
+
+ </LinearLayout>
+</LinearLayout>
+
diff --git a/res/layout/time_interval_popup.xml b/res/layout/time_interval_popup.xml
new file mode 100644
index 000000000..9cf224a7a
--- /dev/null
+++ b/res/layout/time_interval_popup.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2011, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.TimeIntervalPopup xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SettingPopupWindow">
+
+ <LinearLayout android:orientation="vertical"
+ android:background="@color/popup_background"
+ android:layout_height="wrap_content"
+ android:layout_width="@dimen/big_setting_popup_window_width">
+
+ <LinearLayout android:orientation="horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent">
+ <TextView android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:ellipsize="end"
+ android:layout_weight="1"
+ android:minHeight="@dimen/popup_title_frame_min_height"
+ style="@style/PopupTitleText" />
+ <Switch
+ android:id="@+id/time_lapse_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:layout_marginRight="8dp"
+ android:layout_gravity="right|center_vertical" />
+ </LinearLayout>
+
+ <View style="@style/PopupTitleSeparator" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/set_time_interval_help_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="16dip"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:paddingBottom="16dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/set_time_interval_help"/>
+ </LinearLayout>
+
+ <LinearLayout android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal" >
+ <include layout="@layout/time_interval_picker"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:divider="?android:attr/dividerHorizontal"
+ android:showDividers="beginning"
+ android:dividerPadding="0dip">
+ <Button android:id="@+id/time_lapse_interval_set_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/time_lapse_interval_set" />
+ </LinearLayout>
+ </LinearLayout>
+
+</com.android.camera.ui.TimeIntervalPopup>
diff --git a/res/layout/timer_setting_popup.xml b/res/layout/timer_setting_popup.xml
new file mode 100644
index 000000000..d6e8000ee
--- /dev/null
+++ b/res/layout/timer_setting_popup.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2013, The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<com.android.camera.ui.TimerSettingPopup xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SettingPopupWindow">
+
+ <LinearLayout android:orientation="vertical"
+ android:background="@color/popup_background"
+ android:layout_height="wrap_content"
+ android:layout_width="@dimen/big_setting_popup_window_width">
+
+ <LinearLayout android:orientation="horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent">
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:layout_weight="1"
+ android:minHeight="@dimen/popup_title_frame_min_height"
+ android:gravity="center_vertical"
+ style="@style/PopupTitleText" />
+ <Switch
+ android:id="@+id/timer_setting_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:layout_marginRight="8dp"
+ android:layout_gravity="right|center_vertical" />
+ </LinearLayout>
+
+ <View style="@style/PopupTitleSeparator" />
+
+ <TextView
+ android:id="@+id/set_timer_help_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="16dip"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
+ android:paddingBottom="16dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/set_timer_help"/>
+
+ <LinearLayout
+ android:id="@+id/time_duration_picker"
+ android:orientation="vertical"
+ android:layout_gravity="center_horizontal"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent">
+ <TextView
+ android:id="@+id/set_time_interval_title"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="5dip"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/set_duration"/>
+ <!-- A number picker to set timer -->
+ <NumberPicker
+ android:id="@+id/duration"
+ android:layout_width="160dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:layout_gravity="center_horizontal"
+ android:focusable="false" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:divider="?android:attr/dividerHorizontal"
+ android:showDividers="beginning"
+ android:dividerPadding="0dip">
+ <Button android:id="@+id/timer_set_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ style="?android:attr/buttonBarButtonStyle"
+ android:text="@string/time_lapse_interval_set" />
+ </LinearLayout>
+ </LinearLayout>
+
+</com.android.camera.ui.TimerSettingPopup>
diff --git a/res/layout/viewfinder_labels_video.xml b/res/layout/viewfinder_labels_video.xml
new file mode 100644
index 000000000..cfe3b0211
--- /dev/null
+++ b/res/layout/viewfinder_labels_video.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- This layout is shared by phone and tablet in portrait or landscape orientation. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent">
+ <TextView android:id="@+id/recording_time"
+ style="@style/OnViewfinderLabel"
+ android:gravity="center"
+ android:drawableLeft="@drawable/ic_recording_indicator"
+ android:drawablePadding="5dp"
+ android:visibility="gone" />
+ <TextView android:id="@+id/time_lapse_label"
+ android:text="@string/time_lapse_title"
+ style="@style/OnViewfinderLabel"
+ android:visibility="gone" />
+</LinearLayout>