summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-07-01 15:46:55 +0400
committerAndrew Dolgov <[email protected]>2012-07-01 15:46:55 +0400
commitc9718b32e3ff62c272c291c0c1931325cbbe4b8b (patch)
treec044a4d93a34d66a98ebe357873535c04e149989
parentb80b684d12e31a962ac6bdc0e60c19687bc02d28 (diff)
attempt to workaround against some unknown actionbar navigation related
crash, bump version
-rw-r--r--AndroidManifest.xml4
-rw-r--r--src/org/fox/ttrss/MainActivity.java3
-rw-r--r--src/org/fox/ttrss/offline/OfflineActivity.java1
3 files changed, 5 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7d9a0025..5306e0af 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="83"
- android:versionName="0.6.7" >
+ android:versionCode="84"
+ android:versionName="0.6.8" >
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="11" />
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index ae79bebe..bc9883c4 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -673,7 +673,8 @@ public class MainActivity extends CommonActivity implements OnlineServices {
m_headlinesActionModeCallback = new HeadlinesActionModeCallback();
m_navigationListener = new NavigationListener();
-
+
+ getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
getActionBar().setListNavigationCallbacks(m_navigationAdapter, m_navigationListener);
}
diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java
index daef78e6..24899907 100644
--- a/src/org/fox/ttrss/offline/OfflineActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineActivity.java
@@ -304,6 +304,7 @@ public class OfflineActivity extends CommonActivity implements
m_headlinesActionModeCallback = new HeadlinesActionModeCallback();
m_navigationListener = new NavigationListener();
+ getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
getActionBar().setListNavigationCallbacks(m_navigationAdapter, m_navigationListener);
m_headlinesActionModeCallback = new HeadlinesActionModeCallback();