summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2011-09-13 11:26:13 +0800
committerAngus Kong <shkong@google.com>2011-09-13 12:50:47 +0800
commit8df38bbe67338a1f5dc58996bd8866f4c1fe264d (patch)
treea1e1b6f6175ba7b9c818d23d4cfdb4327a316158 /res/layout
parentca667e83ccbca59879a236aae8156e8735ce32a5 (diff)
downloadLegacyCamera-8df38bbe67338a1f5dc58996bd8866f4c1fe264d.zip
LegacyCamera-8df38bbe67338a1f5dc58996bd8866f4c1fe264d.tar.gz
LegacyCamera-8df38bbe67338a1f5dc58996bd8866f4c1fe264d.tar.bz2
Show capture indication for panorama.
bug:5298354 Change-Id: I430d833dff9b7bcab6353889522da6e55e58d4e4
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/pano_capture.xml19
-rw-r--r--res/layout/pano_review.xml4
2 files changed, 19 insertions, 4 deletions
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml
index 00af551..5988196 100644
--- a/res/layout/pano_capture.xml
+++ b/res/layout/pano_capture.xml
@@ -30,7 +30,22 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <ImageView style="@style/PanoViewHorizontalGrayBar"/>
+ <FrameLayout android:id="@+id/pano_capture_indicator_layout"
+ style="@style/PanoViewHorizontalBar">
+
+ <TextView
+ android:id="@+id/pano_capture_indicator"
+ android:text="@string/pano_capture_indication"
+ android:paddingTop="0dp"
+ android:drawablePadding="5sp"
+ android:drawableLeft="@drawable/ic_pan_recording_indicator"
+ android:visibility="gone"
+ android:layout_marginLeft="16dp"
+ android:layout_marginTop="16dp"
+ android:layout_gravity="top|left"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </FrameLayout>
<com.android.camera.panorama.MosaicRendererSurfaceView
android:id="@+id/pano_renderer"
@@ -39,7 +54,7 @@
android:layout_height="@dimen/pano_mosaic_surface_height" />
<FrameLayout
- style="@style/PanoViewHorizontalGrayBar">
+ style="@style/PanoViewHorizontalBar">
<com.android.camera.panorama.PanoProgressBar
android:id="@+id/pano_pan_progress_bar"
android:visibility="gone"
diff --git a/res/layout/pano_review.xml b/res/layout/pano_review.xml
index 51ae880..9e0b750 100644
--- a/res/layout/pano_review.xml
+++ b/res/layout/pano_review.xml
@@ -22,7 +22,7 @@
android:layout_height="match_parent">
<LinearLayout android:id="@+id/pano_review_control"
- style="@style/PanoViewHorizontalGrayBar"
+ style="@style/PanoViewHorizontalBar"
android:gravity="right"
android:orientation="horizontal"
android:layout_alignParentBottom="true"
@@ -42,7 +42,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/pano_mosaic_surface_height" />
- <RelativeLayout style="@style/PanoViewHorizontalGrayBar">
+ <RelativeLayout style="@style/PanoViewHorizontalBar">
<com.android.camera.panorama.PanoProgressBar
android:id="@+id/pano_saving_progress_bar"
android:src="@drawable/ic_pan_progression"