diff options
author | Chung-yih Wang <cywang@google.com> | 2011-10-18 12:47:44 +0800 |
---|---|---|
committer | Chung-yih Wang <cywang@google.com> | 2011-11-01 15:31:16 +0800 |
commit | d33109730e0ab81230f84e2bd35599e8e24fc4ba (patch) | |
tree | df80db1d6647bf952f495a81d8ab67ee7498880d /res/layout-sw600dp | |
parent | abf79a3e25e6c631275e9f81424c0aa25ec9191b (diff) | |
download | LegacyCamera-d33109730e0ab81230f84e2bd35599e8e24fc4ba.zip LegacyCamera-d33109730e0ab81230f84e2bd35599e8e24fc4ba.tar.gz LegacyCamera-d33109730e0ab81230f84e2bd35599e8e24fc4ba.tar.bz2 |
Change the default orientation to portrait.
bug:5446617
Since the orientation is mainly portrait on phones, the default
orientation of an application will decide if the window animation will
be played before it starts. In order to reduce the launch time of Camera
apps, this change is to skip the window animations by changing the default
orientation to portrait.
Change-Id: I6682ab408d7e8d1f0580f3c1600b6c9c3d6a7f6e
Diffstat (limited to 'res/layout-sw600dp')
-rw-r--r-- | res/layout-sw600dp/pano_capture.xml | 128 | ||||
-rw-r--r-- | res/layout-sw600dp/pano_review.xml | 80 | ||||
-rw-r--r-- | res/layout-sw600dp/share_popup.xml | 87 | ||||
-rw-r--r-- | res/layout-sw600dp/viewfinder_labels_video.xml | 31 |
4 files changed, 326 insertions, 0 deletions
diff --git a/res/layout-sw600dp/pano_capture.xml b/res/layout-sw600dp/pano_capture.xml new file mode 100644 index 0000000..2f58b10 --- /dev/null +++ b/res/layout-sw600dp/pano_capture.xml @@ -0,0 +1,128 @@ +<?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_capture_layout" + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="horizontal"> + + <RelativeLayout android:id="@+id/frame_layout" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1"> + + <LinearLayout android:id="@+id/pano_capture_preview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <!-- The top bar with capture indication --> + <FrameLayout android:id="@+id/pano_capture_indicator_layout" + style="@style/PanoViewHorizontalBar" + android:padding="5dp"> + + <com.android.camera.ui.RotateLayout + android:id="@+id/pano_capture_indicator" + android:visibility="gone" + android:layout_gravity="top|left" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <TextView + android:text="@string/pano_capture_indication" + android:paddingLeft="0dp" + android:drawablePadding="5sp" + android:drawableLeft="@drawable/ic_pan_recording_indicator" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + </com.android.camera.ui.RotateLayout> + </FrameLayout> + + <RelativeLayout + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="@dimen/pano_mosaic_surface_height"> + <com.android.camera.panorama.MosaicRendererSurfaceView + android:id="@+id/pano_renderer" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <View + android:id="@+id/pano_speed_indication_border" + android:visibility="gone" + android:background="@drawable/ic_pan_border_fast" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + </RelativeLayout> + + <!-- 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.panorama.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="@dimen/pano_capture_too_fast_text_height" + android:visibility="gone" /> + </com.android.camera.ui.RotateLayout> + </RelativeLayout> + + <include layout="@layout/camera_control" /> + +</LinearLayout> diff --git a/res/layout-sw600dp/pano_review.xml b/res/layout-sw600dp/pano_review.xml new file mode 100644 index 0000000..c16df1a --- /dev/null +++ b/res/layout-sw600dp/pano_review.xml @@ -0,0 +1,80 @@ +<?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="invisible" + android:orientation="vertical" + android:layout_height="match_parent" + android:layout_width="match_parent"> + + <LinearLayout android:id="@+id/pano_review_control" + style="@style/PanoViewHorizontalBar" + android:gravity="right" + android:orientation="horizontal"> + + <com.android.camera.ui.RotateLayout + android:id="@+id/pano_review_cancel_button_layout" + android:layout_gravity="center_vertical" + android:layout_marginRight="20dp" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <TextView android:id="@+id/pano_review_cancel_button" + android:text="@string/review_cancel" + android:gravity="right" + android:clickable="true" + android:onClick="onCancelButtonClicked" + android:textAppearance="?android:textAppearanceMedium" + android:minWidth="@dimen/pano_review_button_width" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + </com.android.camera.ui.RotateLayout> + </LinearLayout> + + <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_review_saving_indication_layout" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_marginLeft="20dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <TextView android:id="@+id/pano_review_saving_indication" + android:text="@string/pano_review_saving_indication_str" + android:textAppearance="?android:textAppearanceMedium" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> + </com.android.camera.ui.RotateLayout> + + <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.panorama.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> + </RelativeLayout> +</LinearLayout> diff --git a/res/layout-sw600dp/share_popup.xml b/res/layout-sw600dp/share_popup.xml new file mode 100644 index 0000000..5f72365 --- /dev/null +++ b/res/layout-sw600dp/share_popup.xml @@ -0,0 +1,87 @@ +<?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. +--> + +<!-- Use a full-screen popup window because UI has some intermediate problems + when its size is changed. --> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:camera="http://schemas.android.com/apk/res/com.android.camera" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/share_popup_background"> + <FrameLayout android:id="@+id/root" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|center"> + <RelativeLayout android:id="@+id/share_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@drawable/border_last_picture"> + <com.android.camera.ui.RotateLayout + android:id="@+id/thumbnail_rotate_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true"> + <!-- The size of the thumbnail is calculated in SharePopup.java --> + <FrameLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + <ImageView android:id="@+id/thumbnail" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:scaleType="fitCenter"/> + <ImageView android:id="@+id/play" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:scaleType="center" + style="@style/ReviewPlayIcon"/> + </FrameLayout> + </com.android.camera.ui.RotateLayout> + </RelativeLayout> + <LinearLayout + android:layout_width="@dimen/share_item_width" + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_gravity="right" + android:background="@color/share_icon_background"> + <com.android.camera.ui.RotateLayout + android:layout_marginTop="8dip" + android:id="@+id/goto_gallery_button_rotate" + android:layout_gravity="center" + android:layout_width="match_parent" + android:layout_height="wrap_content" > + <ImageButton + android:id="@+id/goto_gallery_button" + android:background="?android:attr/selectableItemBackground" + android:layout_gravity="center" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_gallery" /> + </com.android.camera.ui.RotateLayout> + <View + android:layout_width="match_parent" + android:layout_margin="8dip" + android:layout_height="1dp" + android:background="#5affffff" /> + + <GridView android:id="@+id/share_list" + style="@style/OneColumnGrid" /> + </LinearLayout> + </FrameLayout> +</FrameLayout> diff --git a/res/layout-sw600dp/viewfinder_labels_video.xml b/res/layout-sw600dp/viewfinder_labels_video.xml new file mode 100644 index 0000000..6fa7d2d --- /dev/null +++ b/res/layout-sw600dp/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. +--> + +<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> |