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

open drawer if needed onbackpressed

Browse Source
This commit is contained in:
Andrew Dolgov 2014-10-31 09:36:45 +03:00
parent b0040b507c
commit 0a3a533844
3 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="251" android:versionCode="252"
android:versionName="1.51" > android:versionName="1.51" >
<uses-sdk <uses-sdk

23
org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsActivity.java
View File

@ -293,24 +293,11 @@ public class FeedsActivity extends OnlineActivity implements HeadlinesEventListe
@Override @Override
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed(); if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START)) {
m_drawerLayout.openDrawer(Gravity.START);
/* if (m_actionbarRevertDepth > 0) { } else {
super.onBackPressed();
if (m_feedIsSelected && m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START)) { }
m_drawerLayout.closeDrawers();
} else {
m_actionbarRevertDepth = m_actionbarRevertDepth - 1;
m_actionbarUpEnabled = m_actionbarRevertDepth > 0;
getSupportActionBar().setDisplayHomeAsUpEnabled(m_actionbarUpEnabled);
onBackPressed();
}
} else if (m_slidingMenu != null && !m_slidingMenu.isMenuShowing()) {
m_slidingMenu.showMenu();
} else {
super.onBackPressed();
} */
} }
@Override @Override

23
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsActivity.java
View File

@ -123,24 +123,11 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
@Override @Override
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed(); if (m_drawerLayout != null && !m_drawerLayout.isDrawerOpen(Gravity.START)) {
m_drawerLayout.openDrawer(Gravity.START);
/* if (m_actionbarRevertDepth > 0) { } else {
super.onBackPressed();
if (m_feedIsSelected && m_slidingMenu != null && !m_slidingMenu.isMenuShowing()) { }
m_slidingMenu.showMenu();
} else {
m_actionbarRevertDepth = m_actionbarRevertDepth - 1;
m_actionbarUpEnabled = m_actionbarRevertDepth > 0;
getSupportActionBar().setDisplayHomeAsUpEnabled(m_actionbarUpEnabled);
onBackPressed();
}
} else if (m_slidingMenu != null && !m_slidingMenu.isMenuShowing()) {
m_slidingMenu.showMenu();
} else {
super.onBackPressed();
} */
} }
@Override @Override