diff options
| author | Angus Kong <shkong@google.com> | 2013-08-06 19:51:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-06 19:51:37 +0000 |
| commit | 43d50328a2dcd3ab22821ce5d20715ad206dca1c (patch) | |
| tree | 423f712a4195e26730fdedb7e4ce1207816c67cb /res/layout | |
| parent | 1009bb05ec8f64d53e2faf0fc7c8096dbd018253 (diff) | |
| parent | e256999a30f0bb2bf0eb6fbef4023c82d374a5d0 (diff) | |
| download | android_packages_apps_Gallery2-43d50328a2dcd3ab22821ce5d20715ad206dca1c.tar.gz android_packages_apps_Gallery2-43d50328a2dcd3ab22821ce5d20715ad206dca1c.tar.bz2 android_packages_apps_Gallery2-43d50328a2dcd3ab22821ce5d20715ad206dca1c.zip | |
Merge "Show PhotoSphere stitching progress." into gb-ub-photos-carlsbad
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 39 |
1 files changed, 38 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> |