summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-10-25 17:49:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-25 17:49:27 -0700
commit6106c833161cf8e64fc6a9580116f11f4a02d98b (patch)
treeadf0d03e56208ef8b11c38b8bf7b630d5f0ea32a /res
parent5388677d3078f2c218d22465c955e3df6b2ffbed (diff)
parent00914f56c3390caa224b1c9fc07624665de40113 (diff)
downloadandroid_packages_apps_Gallery2-6106c833161cf8e64fc6a9580116f11f4a02d98b.tar.gz
android_packages_apps_Gallery2-6106c833161cf8e64fc6a9580116f11f4a02d98b.tar.bz2
android_packages_apps_Gallery2-6106c833161cf8e64fc6a9580116f11f4a02d98b.zip
Merge "Add loading spinner" into gb-ub-photos-arches
Diffstat (limited to 'res')
-rw-r--r--res/layout/filtershow_activity.xml13
1 files changed, 11 insertions, 2 deletions
diff --git a/res/layout/filtershow_activity.xml b/res/layout/filtershow_activity.xml
index 00f0b8f10..1d0ddf3cd 100644
--- a/res/layout/filtershow_activity.xml
+++ b/res/layout/filtershow_activity.xml
@@ -141,11 +141,21 @@
android:visibility="gone" />
</com.android.gallery3d.filtershow.CenteredLinearLayout>
+
+ <ProgressBar
+ android:id="@+id/loading"
+ style="@android:style/Widget.Holo.ProgressBar.Large"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:indeterminate="true"
+ android:indeterminateOnly="true" />
+
</FrameLayout>
<com.android.gallery3d.filtershow.CenteredLinearLayout
xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
- android:id="@+id/mainPanel"
+ android:id="@+id/filtersPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
@@ -380,7 +390,6 @@
<com.android.gallery3d.filtershow.CenteredLinearLayout
xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d"
- android:id="@+id/mainPanel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"