summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-09-09 13:23:56 +0400
committerAndrew Dolgov <[email protected]>2011-09-09 13:23:56 +0400
commit7393ab7631bfe138263ea8ffe2be4e012908d6c9 (patch)
treef8566f19e0f5cab65fd773c8939f24aa19442f9e /res
parent38028b1e7e47b239a4942c851a04c9903fc684c3 (diff)
various activity lifecycle-related fixes
Diffstat (limited to 'res')
-rw-r--r--res/layout/feeds_fragment.xml5
-rw-r--r--res/menu/main_menu.xml6
-rw-r--r--res/values/strings.xml3
3 files changed, 11 insertions, 3 deletions
diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml
index 90bf1907..9d2db1cc 100644
--- a/res/layout/feeds_fragment.xml
+++ b/res/layout/feeds_fragment.xml
@@ -10,4 +10,9 @@
<ProgressBar android:layout_height="wrap_content"
android:layout_width="wrap_content" android:visibility="invisible"
android:layout_gravity="center" android:id="@+id/loading_progress"/>
+ <TextView android:id="@+id/no_unread_feeds"
+ android:visibility="invisible"
+ android:layout_gravity="center"
+ android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_unread_feeds"></TextView>
+
</FrameLayout>
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index f935a5e2..ebd8fe44 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -5,9 +5,9 @@
android:title="@string/preferences"
android:showAsAction="ifRoom|withText"/>
- <!-- <item android:id="@+id/logout"
- android:title="@string/logout"
+ <item android:id="@+id/sync_status"
+ android:title="@string/offline"
android:icon="@android:drawable/presence_offline"
- android:showAsAction="ifRoom|withText"/> -->
+ android:showAsAction="ifRoom|withText"/>
</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4ac1e8a..8dc43dcb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,4 +24,7 @@
<string name="login_wrong_password">Login failed: username or password incorrect.</string>
<string name="login_success">Logged in.</string>
<string name="no_unread_feeds">No unread feeds.</string>
+ <string name="offline">Offline</string>
+ <string name="online">Online</string>
+ <string name="synchronizing">Synchronizing...</string>
</resources>