diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/camera_filmstrip.xml | 39 | ||||
-rw-r--r-- | res/layout/video_module.xml | 7 |
2 files changed, 45 insertions, 1 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index 935f38ae8..d94a9d2a8 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -38,4 +38,41 @@ android:visibility="gone" android:src="@drawable/ic_view_photosphere" /> -</FrameLayout>
\ No newline at end of file + <LinearLayout + android:id="@+id/pano_stitching_progress_panel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center_horizontal" + android:paddingBottom="52dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" + android:paddingTop="5dp" + android:visibility="gone" + android:orientation="vertical"> + + <TextView + android:id="@+id/pano_stitching_progress_text" + android:text="@string/pano_progress_text" + android:textColor="#ffffffff" + android:textSize="14dp" + android:shadowColor="#ff000000" + android:shadowDx="0" + android:shadowDy="0" + android:shadowRadius="2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:paddingBottom="8dp" + android:visibility="visible" + android:layout_gravity="right"/> + + <ProgressBar + android:id="@+id/pano_stitching_progress_bar" + style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="visible" + android:layout_gravity="bottom|center_horizontal" /> + </LinearLayout> + +</FrameLayout> diff --git a/res/layout/video_module.xml b/res/layout/video_module.xml index 9eb3e84e2..2df1adc9b 100644 --- a/res/layout/video_module.xml +++ b/res/layout/video_module.xml @@ -21,6 +21,13 @@ android:id="@+id/preview_content" android:layout_width="match_parent" android:layout_height="match_parent" /> + <View + android:id="@+id/flash_overlay" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/white" + android:visibility="gone" + android:alpha="0" /> <FrameLayout android:id="@+id/preview_border" android:layout_width="match_parent" android:layout_height="match_parent" |