summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2011-09-07 05:14:15 +0800
committerAngus Kong <shkong@google.com>2011-09-07 05:27:36 +0800
commita466abbd54caa8100a1ef6584a5b0db78224a125 (patch)
tree5b85264cb029e909bad881f404dd778af403004d /res
parent957e7732b2095087b25646a7d1b272b8d010a703 (diff)
downloadLegacyCamera-a466abbd54caa8100a1ef6584a5b0db78224a125.zip
LegacyCamera-a466abbd54caa8100a1ef6584a5b0db78224a125.tar.gz
LegacyCamera-a466abbd54caa8100a1ef6584a5b0db78224a125.tar.bz2
The controls stay while capturing.
Change-Id: I1f375b8526dc131ee658c38c5b5dfa62fdf05335
Diffstat (limited to 'res')
-rw-r--r--res/anim/slide_in_from_right.xml22
-rw-r--r--res/anim/slide_out_to_right.xml22
-rw-r--r--res/layout/pano_capture.xml51
3 files changed, 29 insertions, 66 deletions
diff --git a/res/anim/slide_in_from_right.xml b/res/anim/slide_in_from_right.xml
deleted file mode 100644
index 567c2a1..0000000
--- a/res/anim/slide_in_from_right.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:anim/decelerate_interpolator"
- android:fromXDelta="100%"
- android:toXDelta="0%"
- android:duration="300">
-</translate>
diff --git a/res/anim/slide_out_to_right.xml b/res/anim/slide_out_to_right.xml
deleted file mode 100644
index 01a321b..0000000
--- a/res/anim/slide_out_to_right.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.
--->
-
-<translate xmlns:android="http://schemas.android.com/apk/res/android"
- android:interpolator="@android:anim/decelerate_interpolator"
- android:fromXDelta="0%"
- android:toXDelta="100%"
- android:duration="300">
-</translate>
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index 7736ddf..3af0f34 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -20,33 +20,42 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <LinearLayout android:id="@+id/pano_capture_preview"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="horizontal">
- <ImageView style="@style/PanoViewHorizontalGrayBar"/>
+ <LinearLayout android:id="@+id/pano_capture_preview"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:orientation="vertical">
- <com.android.camera.panorama.MosaicRendererSurfaceView
- android:id="@+id/pano_renderer"
- android:layout_gravity="center"
- android:layout_width="@dimen/pano_mosaic_surface_width"
- android:layout_height="@dimen/pano_mosaic_surface_height" />
+ <ImageView style="@style/PanoViewHorizontalGrayBar"/>
- <LinearLayout android:id="@+id/pano_capture_control"
- style="@style/PanoViewHorizontalGrayBar"
- android:gravity="right"
- android:visibility="visible"
- android:orientation="horizontal">
+ <com.android.camera.panorama.MosaicRendererSurfaceView
+ android:id="@+id/pano_renderer"
+ android:layout_gravity="center"
+ android:layout_width="@dimen/pano_mosaic_surface_width"
+ android:layout_height="@dimen/pano_mosaic_surface_height" />
- <Button android:id="@+id/pano_capture_stop_button"
- android:text="@string/pano_capture_stop"
- android:onClick="onStopButtonClicked"
- android:visibility="gone"
- android:textAppearance="?android:textAppearanceMedium"
- android:layout_width="@dimen/pano_capture_stop_button_width"
- android:layout_height="@dimen/pano_capture_stop_button_width" />
+ <LinearLayout android:id="@+id/pano_capture_control"
+ style="@style/PanoViewHorizontalGrayBar"
+ android:gravity="right"
+ android:visibility="visible"
+ android:orientation="horizontal">
+
+ <Button android:id="@+id/pano_capture_stop_button"
+ android:text="@string/pano_capture_stop"
+ android:onClick="onStopButtonClicked"
+ android:visibility="gone"
+ android:textAppearance="?android:textAppearanceMedium"
+ android:layout_width="@dimen/pano_capture_stop_button_width"
+ android:layout_height="@dimen/pano_capture_stop_button_width" />
+ </LinearLayout>
</LinearLayout>
+ <include layout="@layout/pano_control" />
+
</LinearLayout>
<com.android.camera.panorama.IndicationView
@@ -57,8 +66,6 @@
android:layout_width="@dimen/pano_indication_width"
android:layout_height="@dimen/pano_indication_height" />
- <include layout="@layout/pano_control" android:id="@+id/pano_control_layout" />
-
<TextView android:id="@+id/pano_capture_too_fast_textview"
android:text="@string/pano_too_fast_prompt"
android:textAppearance="?android:textAppearanceMedium"