diff options
| author | John Reck <jreck@google.com> | 2012-10-25 17:51:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-25 17:51:05 -0700 |
| commit | cb4daa8699520600441423694bc61e870ec62d18 (patch) | |
| tree | 9c97eb00f8a45be9d2dfda5084bc469d3e568d4a /res | |
| parent | 6630f4e8513342c0a8ee5d8b4363f9c3dc9a6c58 (diff) | |
| parent | 407ae8fab03292c52f747fdedaef4520288243cf (diff) | |
| download | android_packages_apps_Snap-cb4daa8699520600441423694bc61e870ec62d18.tar.gz android_packages_apps_Snap-cb4daa8699520600441423694bc61e870ec62d18.tar.bz2 android_packages_apps_Snap-cb4daa8699520600441423694bc61e870ec62d18.zip | |
am 6106c833: Merge "Add loading spinner" into gb-ub-photos-arches
* commit '6106c833161cf8e64fc6a9580116f11f4a02d98b':
Add loading spinner
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/filtershow_activity.xml | 13 |
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" |