summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2013-04-11 22:52:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-11 22:52:42 +0000
commite51f236bfcc617979871f0be7ce46691cf5415c8 (patch)
tree0ca6dbf49beeca7f1640f690b5a8f471505240a8 /res/layout
parent2634fe5fb34ed749d25c0e13113a9ba6c6e8cf90 (diff)
parent0683fe0a1c913d6cc48a127bf6a1486422d1b040 (diff)
downloadandroid_packages_apps_Gallery2-e51f236bfcc617979871f0be7ce46691cf5415c8.tar.gz
android_packages_apps_Gallery2-e51f236bfcc617979871f0be7ce46691cf5415c8.tar.bz2
android_packages_apps_Gallery2-e51f236bfcc617979871f0be7ce46691cf5415c8.zip
Merge "Show loading indicator in full-screen importer view" into gb-ub-photos-bryce
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/ingest_fullsize.xml11
1 files changed, 9 insertions, 2 deletions
diff --git a/res/layout/ingest_fullsize.xml b/res/layout/ingest_fullsize.xml
index ab88bd712..fad596c72 100644
--- a/res/layout/ingest_fullsize.xml
+++ b/res/layout/ingest_fullsize.xml
@@ -17,12 +17,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent" >
+ <ProgressBar
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:progress="1"
+ android:indeterminate="true"
+ android:indeterminateOnly="true" />
+
<com.android.gallery3d.ingest.ui.MtpImageView
android:id="@+id/ingest_fullsize_image"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:layout_centerHorizontal="true"
- android:layout_centerVertical="true"
android:scaleType="matrix" />
<CheckBox