diff options
author | Andrew Dolgov <[email protected]> | 2014-11-06 18:49:47 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-11-06 18:49:47 +0400 |
commit | a5ed5074ba675357858e3caaaca77c884456f377 (patch) | |
tree | 19d26ba37c6b5db1790867651291b99d4b771cfa /org.fox.ttrss/src | |
parent | 33b80cfcfdef991c0768eaddf7f3026c5c474ada (diff) |
remove headlinesactivity drawer for reals
Diffstat (limited to 'org.fox.ttrss/src')
-rw-r--r-- | org.fox.ttrss/src/main/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java | 46 |
2 files changed, 1 insertions, 47 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index a359bd1d..88a95bb1 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="268" + android:versionCode="269" android:versionName="1.63" > <uses-sdk diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java index fb68247d..7975c2db 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesActivity.java @@ -22,9 +22,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL protected SharedPreferences m_prefs; - private ActionBarDrawerToggle m_drawerToggle; - private DrawerLayout m_drawerLayout; - @SuppressLint("NewApi") @Override public void onCreate(Bundle savedInstanceState) { @@ -37,31 +34,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL setContentView(R.layout.headlines_articles); - m_drawerLayout = (DrawerLayout) findViewById(R.id.headlines_drawer); - - if (m_drawerLayout != null) { - - m_drawerToggle = new ActionBarDrawerToggle(this, m_drawerLayout, R.string.blank, R.string.blank) { - @Override - public void onDrawerOpened(View drawerView) { - super.onDrawerOpened(drawerView); - - invalidateOptionsMenu(); - } - - @Override - public void onDrawerClosed(View drawerView) { - super.onDrawerClosed(drawerView); - - invalidateOptionsMenu(); - } - }; - - m_drawerLayout.setDrawerListener(m_drawerToggle); - m_drawerToggle.setDrawerIndicatorEnabled(true); - - } - getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setHomeButtonEnabled(true); @@ -70,10 +42,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL GlobalState.getInstance().load(savedInstanceState); - /* if (isPortrait() || m_prefs.getBoolean("headlines_hide_sidebar", false)) { - findViewById(R.id.headlines_fragment).setVisibility(View.GONE); - } */ - if (savedInstanceState == null) { Intent i = getIntent(); @@ -134,12 +102,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL } } - protected void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - // Sync the toggle state after onRestoreInstanceState has occurred. - if (m_drawerToggle != null) m_drawerToggle.syncState(); - } - @Override protected void refresh() { super.refresh(); @@ -165,10 +127,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL @Override public boolean onOptionsItemSelected(MenuItem item) { - if (m_drawerToggle != null && m_drawerToggle.onOptionsItemSelected(item)) { - return true; - } - switch (item.getItemId()) { case android.R.id.home: finish(); @@ -246,10 +204,6 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL new Handler().postDelayed(new Runnable() { @Override public void run() { - if (m_drawerLayout != null) { - m_drawerLayout.closeDrawers(); - } - ArticlePager af = (ArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); if (af != null) { |