diff options
| author | Angus Kong <shkong@google.com> | 2013-08-21 18:28:43 -0700 |
|---|---|---|
| committer | Angus Kong <shkong@google.com> | 2013-08-23 13:17:10 -0700 |
| commit | 653c43be6e58be54cf2ac3c8efb2d65ac20bd03b (patch) | |
| tree | 7fab1ec4d4dbc93ab2fa23e05a87f2ec598aaf71 /res/layout/camera_filmstrip.xml | |
| parent | 00373f8a411042964f019a6355864a4c25fc2238 (diff) | |
| download | android_packages_apps_Snap-653c43be6e58be54cf2ac3c8efb2d65ac20bd03b.tar.gz android_packages_apps_Snap-653c43be6e58be54cf2ac3c8efb2d65ac20bd03b.tar.bz2 android_packages_apps_Snap-653c43be6e58be54cf2ac3c8efb2d65ac20bd03b.zip | |
Bring back undo delete confirmation.
Also corrects the default decoding size.
bug:10413110
bug:10330214
Change-Id: I45465fdea2320501fd17ac4e35e0f0f54c08cbba
Diffstat (limited to 'res/layout/camera_filmstrip.xml')
| -rw-r--r-- | res/layout/camera_filmstrip.xml | 75 |
1 files changed, 42 insertions, 33 deletions
diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index 4281aac3d..80e6c4b3a 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -16,6 +16,7 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/camera_layout_root" android:layout_width="match_parent" android:layout_height="match_parent" > @@ -24,43 +25,51 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <include layout="@layout/filmstrip_bottom_controls" /> - - <LinearLayout - android:id="@+id/pano_stitching_progress_panel" + <!--com.android.camera.ui.FitSystemUiFrameLayout--> + <FrameLayout + android:id="@+id/camera_above_filmstrip_layout" 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"> + android:layout_height="match_parent" > - <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"/> + <include layout="@layout/filmstrip_bottom_controls" /> - <ProgressBar - android:id="@+id/pano_stitching_progress_bar" - style="@android:style/Widget.Holo.Light.ProgressBar.Horizontal" + <LinearLayout + android:id="@+id/pano_stitching_progress_panel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="visible" - android:layout_gravity="bottom|center_horizontal" /> - </LinearLayout> + 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> + <!--/com.android.camera.ui.FitSystemUiFrameLayout--> </FrameLayout> |