make sure split actionbar actually works
remove collapsible share provider hack
This commit is contained in:
parent
0712b86397
commit
df79b35b53
@ -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" />
|
||||
|
@ -93,13 +93,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"
|
||||
@ -112,6 +105,13 @@
|
||||
android:showAsAction="ifRoom"
|
||||
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"
|
||||
|
@ -1204,7 +1204,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
|
||||
}
|
||||
return true;
|
||||
case R.id.share_article:
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user