diff options
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | res/menu/main_menu.xml | 14 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 5 |
3 files changed, 13 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3fa4f32d..67da0564 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,7 +15,6 @@ android:allowBackup="true" android:backupAgent=".util.PrefsBackupAgent" android:hardwareAccelerated="true" - uiOptions="splitActionBarWhenNarrow" android:icon="@drawable/icon" android:label="@string/app_name" > <activity @@ -24,10 +23,12 @@ </activity> <activity android:label="@string/app_name" + android:uiOptions="splitActionBarWhenNarrow" android:name=".offline.OfflineActivity" > </activity> <activity android:label="@string/app_name" + android:uiOptions="splitActionBarWhenNarrow" android:name=".MainActivity" > <intent-filter > <action android:name="android.intent.action.MAIN" /> diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 23b36521..df1ed152 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -94,13 +94,6 @@ <group android:id="@+id/menu_group_article" > <item - android:id="@+id/share_article" - android:icon="@android:drawable/ic_menu_share" - android:showAsAction="ifRoom|collapseActionView" - android:actionProviderClass="android.widget.ShareActionProvider" - android:title="@string/share_article"/> - - <item android:id="@+id/toggle_marked" android:icon="@drawable/ic_menu_marked" android:showAsAction="ifRoom" @@ -113,6 +106,13 @@ android:title="@string/article_toggle_published"/> <item + android:id="@+id/share_article" + android:icon="@android:drawable/ic_menu_share" + android:showAsAction="ifRoom" + android:actionProviderClass="android.widget.ShareActionProvider" + android:title="@string/share_article"/> + + <item android:id="@+id/set_unread" android:icon="@android:drawable/ic_menu_recent_history" android:showAsAction="" diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index d3a17b40..b40ddde9 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -1204,7 +1204,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices { } return true; case R.id.share_article: - shareArticle(m_selectedArticle); + if (android.os.Build.VERSION.SDK_INT < 14) { + shareArticle(m_selectedArticle); + } return true; case R.id.toggle_marked: if (m_selectedArticle != null) { @@ -2280,6 +2282,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices { public void setSelectedArticle(Article article) { m_selectedArticle = article; updateHeadlines(); + initMainMenu(); } @Override |