iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure split actionbar actually works

Browse Source 
remove collapsible share provider hack
This commit is contained in:
Andrew Dolgov 2012-06-23 17:51:19 +04:00
parent 0712b86397
commit df79b35b53
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest.xml
View File

@ -15,7 +15,6 @@
android:allowBackup="true" android:allowBackup="true"
android:backupAgent=".util.PrefsBackupAgent" android:backupAgent=".util.PrefsBackupAgent"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
uiOptions="splitActionBarWhenNarrow"
android:icon="@drawable/icon" android:icon="@drawable/icon"
android:label="@string/app_name" > android:label="@string/app_name" >
<activity <activity
@ -24,10 +23,12 @@
</activity> </activity>
<activity <activity
android:label="@string/app_name" android:label="@string/app_name"
android:uiOptions="splitActionBarWhenNarrow"
android:name=".offline.OfflineActivity" > android:name=".offline.OfflineActivity" >
</activity> </activity>
<activity <activity
android:label="@string/app_name" android:label="@string/app_name"
android:uiOptions="splitActionBarWhenNarrow"
android:name=".MainActivity" > android:name=".MainActivity" >
<intent-filter > <intent-filter >
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

14
res/menu/main_menu.xml
View File

@ -93,13 +93,6 @@
<group android:id="@+id/menu_group_article" > <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 <item
android:id="@+id/toggle_marked" android:id="@+id/toggle_marked"
android:icon="@drawable/ic_menu_marked" android:icon="@drawable/ic_menu_marked"
@ -112,6 +105,13 @@
android:showAsAction="ifRoom" android:showAsAction="ifRoom"
android:title="@string/article_toggle_published"/> 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 <item
android:id="@+id/set_unread" android:id="@+id/set_unread"
android:icon="@android:drawable/ic_menu_recent_history" android:icon="@android:drawable/ic_menu_recent_history"

5
src/org/fox/ttrss/MainActivity.java
View File

@ -1204,7 +1204,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
} }
return true; return true;
case R.id.share_article: case R.id.share_article:
shareArticle(m_selectedArticle); if (android.os.Build.VERSION.SDK_INT < 14) {
shareArticle(m_selectedArticle);
}
return true; return true;
case R.id.toggle_marked: case R.id.toggle_marked:
if (m_selectedArticle != null) { if (m_selectedArticle != null) {
@ -2280,6 +2282,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
public void setSelectedArticle(Article article) { public void setSelectedArticle(Article article) {
m_selectedArticle = article; m_selectedArticle = article;
updateHeadlines(); updateHeadlines();
initMainMenu();
} }
@Override @Override