diff options
| -rw-r--r-- | AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | res/menu/main_menu.xml | 2 | ||||
| -rw-r--r-- | res/menu/offline_menu.xml | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 3 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineActivity.java | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index cc689626..539c0c72 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -15,6 +15,7 @@ android:allowBackup="true" android:backupAgent=".util.PrefsBackupAgent" android:hardwareAccelerated="true" + android:uiOptions="splitActionBarWhenNarrow" android:icon="@drawable/icon" android:label="@string/app_name" > <activity @@ -23,12 +24,10 @@ </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:label="@string/app_name" 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 df1ed152..dee31211 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -108,7 +108,7 @@ <item android:id="@+id/share_article" android:icon="@android:drawable/ic_menu_share" - android:showAsAction="ifRoom" + android:showAsAction="" android:actionProviderClass="android.widget.ShareActionProvider" android:title="@string/share_article"/> diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index e4169f43..7b3c8225 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -81,7 +81,7 @@ android:id="@+id/share_article" android:actionProviderClass="android.widget.ShareActionProvider" android:icon="@android:drawable/ic_menu_share" - android:showAsAction="ifRoom" + android:showAsAction="" android:title="@string/share_article"/> <item android:id="@+id/set_unread" diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index b6f6898e..3596b0dc 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -1509,6 +1509,9 @@ public class MainActivity extends CommonActivity implements OnlineServices { if (m_selectedArticle != null) { Log.d(TAG, "setting up share provider"); shareProvider.setShareIntent(getShareIntent(m_selectedArticle)); + + // seems to be needed because galaxy nexus craps out if that item is initially visible as action in XML + m_menu.findItem(R.id.share_article).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); } } diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java index 2d4d4da6..acc05852 100644 --- a/src/org/fox/ttrss/offline/OfflineActivity.java +++ b/src/org/fox/ttrss/offline/OfflineActivity.java @@ -923,6 +923,9 @@ public class OfflineActivity extends CommonActivity implements if (m_selectedArticleId != 0) { Log.d(TAG, "setting up share provider"); shareProvider.setShareIntent(getShareIntent(getArticleById(m_selectedArticleId))); + + // seems to be needed because galaxy nexus craps out if that item is initially visible as action in XML + m_menu.findItem(R.id.share_article).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); } } } |