diff options
author | Wu-cheng Li <wuchengli@google.com> | 2010-09-16 09:14:07 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-16 09:14:07 -0700 |
commit | c8b53e437d9dc9d4f1bfc99fa54d08b76217df31 (patch) | |
tree | 8610af22f53a53add51e8dc1df79a917276d813f /res/layout-xlarge | |
parent | 2b2cbfb78e3e184b55041926c7bc7bdc18cb5934 (diff) | |
parent | 5513f23b77a3e48f8ff3c02ba77bf7ca06203e0d (diff) | |
download | LegacyCamera-c8b53e437d9dc9d4f1bfc99fa54d08b76217df31.zip LegacyCamera-c8b53e437d9dc9d4f1bfc99fa54d08b76217df31.tar.gz LegacyCamera-c8b53e437d9dc9d4f1bfc99fa54d08b76217df31.tar.bz2 |
Merge "Add camera control layout for xlarge."
Diffstat (limited to 'res/layout-xlarge')
-rw-r--r-- | res/layout-xlarge/attach_camera_control.xml | 78 | ||||
-rw-r--r-- | res/layout-xlarge/camera_control.xml | 70 |
2 files changed, 148 insertions, 0 deletions
diff --git a/res/layout-xlarge/attach_camera_control.xml b/res/layout-xlarge/attach_camera_control.xml new file mode 100644 index 0000000..aa34802 --- /dev/null +++ b/res/layout-xlarge/attach_camera_control.xml @@ -0,0 +1,78 @@ +<?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. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" + android:id="@+id/control_bar" + android:layout_height="match_parent" + android:layout_width="76dp" + android:layout_marginTop="13dp" + android:layout_marginBottom="13dp" + android:layout_alignParentRight="true"> + <LinearLayout android:orientation="vertical" + android:gravity="top|center_horizontal" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_height="wrap_content" + android:layout_width="match_parent"> + <LinearLayout style="@style/ReviewControlGroup" + android:layout_marginBottom="15dp"> + <ImageView style="@style/ReviewControlIcon" + android:id="@+id/btn_cancel" + android:src="@drawable/btn_ic_review_cancel"/> + <TextView style="@style/ReviewControlText" + android:text="@string/review_cancel" /> + </LinearLayout> + <LinearLayout style="@style/ReviewControlGroup" + android:visibility="gone" + android:layout_marginBottom="15dp"> + <ImageView style="@style/ReviewControlIcon" + android:id="@+id/btn_retake" + android:src="@drawable/btn_ic_review_retake_photo"/> + <TextView style="@style/ReviewControlText" + android:text="@string/review_retake" /> + </LinearLayout> + <LinearLayout style="@style/ReviewControlGroup" + android:visibility="gone" + android:layout_marginBottom="15dp"> + <ImageView style="@style/ReviewControlIcon" + android:id="@+id/btn_play" + android:src="@drawable/btn_ic_review_play"/> + <TextView style="@style/ReviewControlText" + android:text="@string/review_play" /> + </LinearLayout> + </LinearLayout> + <com.android.camera.ShutterButton android:id="@+id/shutter_button" + android:layout_centerInParent="true" + android:layout_centerHorizontal="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="center" + android:clickable="true" + android:focusable="true" + android:src="@drawable/btn_ic_camera_shutter" + android:background="@drawable/btn_shutter"/> + <LinearLayout style="@style/ReviewControlGroup" + android:visibility="invisible" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true"> + <ImageView style="@style/ReviewControlIcon" + android:id="@+id/btn_done" + android:src="@drawable/btn_ic_review_done"/> + <TextView style="@style/ReviewControlText" + android:text="@string/review_ok" /> + </LinearLayout> +</RelativeLayout> diff --git a/res/layout-xlarge/camera_control.xml b/res/layout-xlarge/camera_control.xml new file mode 100644 index 0000000..5c0c635 --- /dev/null +++ b/res/layout-xlarge/camera_control.xml @@ -0,0 +1,70 @@ +<?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. +--> + +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/control_bar" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="76dp" + android:layout_marginTop="13dp" + android:layout_marginBottom="13dp" + android:layout_alignParentRight="true"> + + <com.android.camera.RotateImageView + android:id="@+id/review_thumbnail" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_height="52dp" + android:layout_width="52dp" + android:clickable="true" + android:focusable="false" + android:background="@drawable/border_last_picture"/> + + <com.android.camera.ShutterButton android:id="@+id/shutter_button" + android:layout_centerInParent="true" + android:layout_centerHorizontal="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:scaleType="center" + android:clickable="true" + android:focusable="true" + android:src="@drawable/btn_ic_camera_shutter" + android:background="@drawable/btn_shutter"/> + + <LinearLayout android:id="@+id/camera_switch_set" + android:orientation="vertical" + android:gravity="center" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:layout_height="wrap_content" + android:layout_width="wrap_content"> + <com.android.camera.RotateImageView android:id="@+id/video_switch_icon" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/btn_ic_mode_switch_video"/> + <com.android.camera.Switcher android:id="@+id/camera_switch" + android:layout_width="wrap_content" + android:layout_height="70dp" + android:src="@drawable/btn_mode_switch_knob" + android:background="@drawable/btn_mode_switch_bg" /> + <com.android.camera.RotateImageView + android:id="@+id/camera_switch_icon" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:src="@drawable/btn_ic_mode_switch_camera"/> + </LinearLayout> +</RelativeLayout> + |