summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorMartin Hibdon <mhibdon@google.com>2014-04-07 17:31:01 -0700
committerMartin Hibdon <mhibdon@google.com>2014-04-09 11:02:27 -0700
commitfa58d1bf1113ca9d6351be3b65a43db60b10d7e7 (patch)
treef4da93d39a21ce7c25ae96dd3089307e292d9be4 /res
parentb32f4f347478d3296a557864e3d4b144800d861f (diff)
downloadandroid_packages_apps_UnifiedEmail-fa58d1bf1113ca9d6351be3b65a43db60b10d7e7.tar.gz
android_packages_apps_UnifiedEmail-fa58d1bf1113ca9d6351be3b65a43db60b10d7e7.tar.bz2
android_packages_apps_UnifiedEmail-fa58d1bf1113ca9d6351be3b65a43db60b10d7e7.zip
ensure loading view appears above content
also ensures it stays visible for 2 seconds. Fade in/out the loading view. Shrink the progress bar shadow. Bug: 12421412 Change-Id: I51fd9de058bf5ddf27674a47e58c82924406960f
Diffstat (limited to 'res')
-rw-r--r--res/layout/conversation_list.xml3
-rw-r--r--res/layout/conversation_list_loading_view.xml3
-rw-r--r--res/values/dimen.xml2
3 files changed, 5 insertions, 3 deletions
diff --git a/res/layout/conversation_list.xml b/res/layout/conversation_list.xml
index 0813a68f2..faa7affd4 100644
--- a/res/layout/conversation_list.xml
+++ b/res/layout/conversation_list.xml
@@ -31,17 +31,18 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:animateLayoutChanges="true"
android:clickable="true">
<!-- Note: intentionally not called "empty" because we call
setEmptyView programmatically-->
<!-- Offset by height of undo bar and action bar -->
<include layout="@layout/conversation_list_empty_view" />
- <include layout="@layout/conversation_list_loading_view" />
<com.android.mail.ui.SwipeableListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/ConversationListFade" />
+ <include layout="@layout/conversation_list_loading_view" />
</FrameLayout>
</com.android.mail.ui.MailSwipeRefreshLayout>
</RelativeLayout>
diff --git a/res/layout/conversation_list_loading_view.xml b/res/layout/conversation_list_loading_view.xml
index febdd6403..a33d05e4c 100644
--- a/res/layout/conversation_list_loading_view.xml
+++ b/res/layout/conversation_list_loading_view.xml
@@ -22,7 +22,8 @@
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
- android:visibility="gone" >
+ android:visibility="gone"
+ android:background="@color/footer_background_color">
<ImageView
android:id="@+id/loading_icon"
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 47d98c8b3..712978046 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -213,5 +213,5 @@
<dimen name="empty_view_space">16dip</dimen>
<dimen name="avatar_border_width">.5dp</dimen>
- <dimen name="progress_bar_height">30dp</dimen>
+ <dimen name="progress_bar_height">12dp</dimen>
</resources>