From ab617db46883ffbb9ee77dacd54613bdc026cc2d Mon Sep 17 00:00:00 2001
From: Chris Wren <cwren@android.com>
Date: Wed, 17 Apr 2013 14:58:58 -0400
Subject: no blank album lists.

Bug: 8060514
Change-Id: Iaf122899f45b9fd94877e695c99872b8103bd616
---
 res/layout/settingslist.xml | 29 +++++++++++++++++++++++------
 res/values/strings.xml      |  2 ++
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/layout/settingslist.xml b/res/layout/settingslist.xml
index 0ea6661..c383856 100644
--- a/res/layout/settingslist.xml
+++ b/res/layout/settingslist.xml
@@ -22,11 +22,28 @@
          android:paddingRight="16dp"
          />
 
-    <ProgressBar android:id="@android:id/empty"
-         style="?android:attr/progressBarStyleLarge"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:layout_gravity="center"
-         />
+    <FrameLayout
+        android:id="@android:id/empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" >
+
+        <ProgressBar
+            android:id="@+id/spinner"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+
+        <TextView
+            android:id="@+id/sorry"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.5"
+            android:gravity="center_vertical|center_horizontal"
+            android:text="@string/no_photos"
+            android:textColor="@android:color/white"
+            android:textSize="20sp"
+            android:visibility="gone" />
 
+    </FrameLayout>
 </merge>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 087f8b1..1f64e10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,4 +47,6 @@
     <!-- Click to clear selection in the album selection activity. [CHAR LIMIT=15] -->
     <string name="photodream_select_none">Deselect All</string>
 
+    <!-- Text shown instead of a list of albums when there are no albums with photos. [CHAR LIMIT=50] -->
+    <string name="no_photos">No photos on the device.</string>
 </resources>
-- 
cgit v1.2.3