diff options
author | Michael Kolb <kolby@google.com> | 2013-01-29 14:03:06 -0800 |
---|---|---|
committer | Michael Kolb <kolby@google.com> | 2013-01-29 15:01:34 -0800 |
commit | 3148b18958ea240e9ac7aac90f16ba1d3df0519f (patch) | |
tree | 0079a774b411f896be3efc6d9bd17c600a687386 /res/layout-land | |
parent | 5973d002f7fe9b79060c27980ecb77693f6994e2 (diff) | |
download | android_packages_apps_Snap-3148b18958ea240e9ac7aac90f16ba1d3df0519f.tar.gz android_packages_apps_Snap-3148b18958ea240e9ac7aac90f16ba1d3df0519f.tar.bz2 android_packages_apps_Snap-3148b18958ea240e9ac7aac90f16ba1d3df0519f.zip |
Copy camera resources into Gallery2
Change-Id: I3be2758b2ddca31dbc2f21457a62664310c39684
Diffstat (limited to 'res/layout-land')
-rw-r--r-- | res/layout-land/camera_shutter_switcher.xml | 48 | ||||
-rw-r--r-- | res/layout-land/keyguard_widget.xml | 60 | ||||
-rw-r--r-- | res/layout-land/on_screen_hint.xml | 29 | ||||
-rw-r--r-- | res/layout-land/pano_module_capture.xml | 26 | ||||
-rw-r--r-- | res/layout-land/pano_review.xml | 56 | ||||
-rw-r--r-- | res/layout-land/photo_module_content.xml | 56 | ||||
-rw-r--r-- | res/layout-land/preview_frame_pano.xml | 97 | ||||
-rw-r--r-- | res/layout-land/review_module_control.xml | 44 | ||||
-rw-r--r-- | res/layout-land/switcher_popup.xml | 29 | ||||
-rw-r--r-- | res/layout-land/video_module.xml | 58 |
10 files changed, 503 insertions, 0 deletions
diff --git a/res/layout-land/camera_shutter_switcher.xml b/res/layout-land/camera_shutter_switcher.xml new file mode 100644 index 000000000..9c06749c7 --- /dev/null +++ b/res/layout-land/camera_shutter_switcher.xml @@ -0,0 +1,48 @@ +<?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/camera_shutter_switcher" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <View + android:id="@+id/controls" + style="@style/CameraControls" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" /> + + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_marginRight="@dimen/shutter_offset" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="center" + android:src="@drawable/btn_new_shutter" /> + + <com.android.camera.ui.CameraSwitcher + android:id="@+id/camera_switcher" + style="@style/SwitcherButton" + android:layout_alignBottom="@id/controls" + android:layout_alignParentRight="true" + android:layout_marginRight="2dip" + android:contentDescription="@string/accessibility_mode_picker" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout-land/keyguard_widget.xml b/res/layout-land/keyguard_widget.xml new file mode 100644 index 000000000..130e00710 --- /dev/null +++ b/res/layout-land/keyguard_widget.xml @@ -0,0 +1,60 @@ +<?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:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/black"> + + <FrameLayout android:id="@+id/controls" + style="@style/CameraControls" + android:layout_alignParentRight="true" + android:layout_centerVertical="true"> + + <include layout="@layout/menu_indicators_keyguard" + android:layout_width="80dip" + android:layout_height="80dip" + android:layout_gravity="top|right" + android:layout_marginTop="-5dip" + android:layout_marginRight="-2dip" /> + + </FrameLayout> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_marginRight="@dimen/shutter_offset" + android:src="@drawable/btn_new_shutter" /> + + <ImageView + style="@style/SwitcherButton" + android:layout_alignBottom="@id/controls" + android:layout_alignParentRight="true" + android:layout_marginRight="2dip" + android:src="@drawable/ic_switch_camera" + android:scaleType="center" /> + + <ImageView + style="@style/SwitcherButton" + android:layout_alignBottom="@id/controls" + android:layout_alignParentRight="true" + android:layout_marginRight="2dip" + android:src="@drawable/ic_switcher_menu_indicator" + android:scaleType="center" /> + +</RelativeLayout> diff --git a/res/layout-land/on_screen_hint.xml b/res/layout-land/on_screen_hint.xml new file mode 100644 index 000000000..59b0d1a63 --- /dev/null +++ b/res/layout-land/on_screen_hint.xml @@ -0,0 +1,29 @@ +<?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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical" + android:background="@drawable/on_screen_hint_frame"> + <TextView + android:id="@+id/message" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:textAppearance="@style/OnScreenHintTextAppearance.Small" + android:textColor="#ffffffff" + android:shadowColor="#BB000000" + android:shadowRadius="2.75" /> +</LinearLayout> diff --git a/res/layout-land/pano_module_capture.xml b/res/layout-land/pano_module_capture.xml new file mode 100644 index 000000000..6cad0bf37 --- /dev/null +++ b/res/layout-land/pano_module_capture.xml @@ -0,0 +1,26 @@ +<?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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_app_root" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:layout_gravity="center" + android:orientation="horizontal"> + + <include layout="@layout/preview_frame_pano" /> + +</LinearLayout> diff --git a/res/layout-land/pano_review.xml b/res/layout-land/pano_review.xml new file mode 100644 index 000000000..ea65c26b5 --- /dev/null +++ b/res/layout-land/pano_review.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. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/pano_review_layout" + android:visibility="gone" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <TextView style="@style/PanoViewHorizontalBar" + android:text="@string/pano_review_rendering" + android:textAppearance="?android:textAppearanceMedium" + android:gravity="center" /> + + <ImageView android:id="@+id/pano_reviewarea" + android:scaleType="fitCenter" + android:layout_width="match_parent" + android:layout_height="@dimen/pano_mosaic_surface_height" /> + + <RelativeLayout style="@style/PanoViewHorizontalBar"> + <com.android.camera.ui.RotateLayout + android:id="@+id/pano_saving_progress_bar_layout" + android:layout_centerInParent="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content"> + <com.android.camera.PanoProgressBar + android:id="@+id/pano_saving_progress_bar" + android:src="@drawable/ic_pan_progression" + android:layout_centerInParent="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + </com.android.camera.ui.RotateLayout> + + <com.android.camera.ui.RotateImageView android:id="@+id/pano_review_cancel_button" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_cancel" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_centerHorizontal="false" + android:src="@drawable/ic_menu_cancel_holo_light" /> + </RelativeLayout> +</LinearLayout> diff --git a/res/layout-land/photo_module_content.xml b/res/layout-land/photo_module_content.xml new file mode 100644 index 000000000..2afcf4081 --- /dev/null +++ b/res/layout-land/photo_module_content.xml @@ -0,0 +1,56 @@ +<?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. +--> +<!-- This layout is shared by phone and tablet in landscape orientation. --> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_app" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/preview_module_frame"/> + + <FrameLayout + style="@style/CameraControls" + android:layout_gravity="center" > + + <View + android:id="@+id/blocker" + android:layout_height="match_parent" + android:layout_width="@dimen/switcher_size" + android:background="@drawable/switcher_bg" + android:clickable="true" + android:layout_gravity="right" /> + + <include layout="@layout/menu_indicators" + android:layout_width="80dip" + android:layout_height="80dip" + android:layout_marginTop="-5dip" + android:layout_marginRight="-2dip" + android:layout_gravity="top|right"/> + + + <include layout="@layout/review_module_control" + android:layout_marginRight="2dip" /> + + <View + android:id="@+id/menu" + style="@style/SwitcherButton" + android:contentDescription="@string/accessibility_menu_button" + android:layout_gravity="right|top" + android:layout_marginRight="2dip" /> + + </FrameLayout> + +</FrameLayout> diff --git a/res/layout-land/preview_frame_pano.xml b/res/layout-land/preview_frame_pano.xml new file mode 100644 index 000000000..bd05f9a8f --- /dev/null +++ b/res/layout-land/preview_frame_pano.xml @@ -0,0 +1,97 @@ +<?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/frame_layout" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1"> + + <LinearLayout android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <!-- The top bar with capture indication --> + <FrameLayout style="@style/PanoViewHorizontalBar"> + <TextView android:id="@+id/pano_capture_indicator" + android:text="@string/pano_capture_indication" + android:textAppearance="?android:textAppearanceMedium" + android:layout_gravity="center" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </FrameLayout> + + <com.android.camera.ui.LayoutNotifyView + android:id="@+id/pano_preview_area" + android:visibility="invisible" + android:background="@drawable/ic_pan_border_fast" + android:layout_gravity="center" + android:layout_weight="5" + android:layout_width="match_parent" + android:layout_height="0dp" /> + + <!-- The bottom bar with progress bar and direction indicators --> + <RelativeLayout style="@style/PanoViewHorizontalBar"> + + <com.android.camera.ui.RotateLayout + android:id="@+id/pano_pan_progress_bar_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true"> + <com.android.camera.PanoProgressBar + android:id="@+id/pano_pan_progress_bar" + android:visibility="gone" + android:src="@drawable/ic_pan_progression" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </com.android.camera.ui.RotateLayout> + <ImageView + android:id="@+id/pano_pan_left_indicator" + android:src="@drawable/pano_direction_left_indicator" + android:visibility="gone" + android:layout_marginRight="5dp" + android:layout_toLeftOf="@id/pano_pan_progress_bar_layout" + android:layout_centerVertical="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <ImageView + android:id="@+id/pano_pan_right_indicator" + android:src="@drawable/pano_direction_right_indicator" + android:visibility="gone" + android:layout_marginLeft="5dp" + android:layout_toRightOf="@id/pano_pan_progress_bar_layout" + android:layout_centerVertical="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </RelativeLayout> + + </LinearLayout> + + <!-- The hint for "Too fast" text view --> + <com.android.camera.ui.RotateLayout + android:id="@+id/pano_capture_too_fast_textview_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true"> + <TextView android:id="@+id/pano_capture_too_fast_textview" + android:text="@string/pano_too_fast_prompt" + android:textAppearance="?android:textAppearanceMedium" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" /> + </com.android.camera.ui.RotateLayout> +</RelativeLayout> diff --git a/res/layout-land/review_module_control.xml b/res/layout-land/review_module_control.xml new file mode 100644 index 000000000..e732a2c80 --- /dev/null +++ b/res/layout-land/review_module_control.xml @@ -0,0 +1,44 @@ +<?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. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_height="match_parent" + android:layout_width="match_parent"> + <com.android.camera.ui.RotateImageView android:id="@+id/btn_done" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_ok" + android:visibility="gone" + android:layout_gravity="top|right" + android:background="@drawable/bg_pressed" + android:src="@drawable/ic_menu_done_holo_light" /> + + <ImageView android:id="@+id/btn_retake" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_retake" + android:layout_gravity="right|center_vertical" + android:scaleType="center" + android:focusable="true" + android:visibility="gone" + android:background="@drawable/bg_pressed" + android:src="@drawable/ic_btn_shutter_retake" /> + + <com.android.camera.ui.RotateImageView android:id="@+id/btn_cancel" + style="@style/ReviewControlIcon" + android:contentDescription="@string/accessibility_review_cancel" + android:visibility="gone" + android:layout_gravity="bottom|right" + android:background="@drawable/bg_pressed" + android:src="@drawable/ic_menu_cancel_holo_light" /> +</FrameLayout> diff --git a/res/layout-land/switcher_popup.xml b/res/layout-land/switcher_popup.xml new file mode 100644 index 000000000..b949f9633 --- /dev/null +++ b/res/layout-land/switcher_popup.xml @@ -0,0 +1,29 @@ +<?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. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@id/camera_switcher" + android:layout_alignRight="@id/camera_switcher" + android:layout_marginRight="8dip" + android:layout_marginBottom="8dip" + android:paddingLeft="8dip" + android:paddingRight="8dip" + android:paddingTop="16dip" + android:paddingBottom="16dip" + android:background="#80000000" /> diff --git a/res/layout-land/video_module.xml b/res/layout-land/video_module.xml new file mode 100644 index 000000000..8dcdc848c --- /dev/null +++ b/res/layout-land/video_module.xml @@ -0,0 +1,58 @@ +<?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. +--> +<!-- This layout is shared by phone and tablet in landscape orientation. --> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_app_root" + android:layout_height="match_parent" + android:layout_width="match_parent"> + <include layout="@layout/preview_module_frame_video"/> + + <RelativeLayout + style="@style/CameraControls" + android:layout_centerVertical="true" > + + <View + android:id="@+id/blocker" + android:layout_width="@dimen/switcher_size" + android:layout_height="match_parent" + android:background="@drawable/switcher_bg" + android:layout_alignParentRight="true" + android:clickable="true" /> + + <include layout="@layout/menu_indicators" + android:layout_width="80dip" + android:layout_height="80dip" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginRight="-2dip" + android:layout_marginTop="-5dip" /> + + <include layout="@layout/bg_replacement_training_message" /> + + <include layout="@layout/review_module_control" + android:layout_marginRight="2dip" /> + + <View + android:id="@+id/menu" + style="@style/SwitcherButton" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginRight="2dip" + android:contentDescription="@string/accessibility_menu_button" /> + + </RelativeLayout> + +</RelativeLayout> |