diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-12-12 11:13:53 -0500 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-12-12 11:13:53 -0500 |
commit | 3bb8d9304a60207d05cf398f21cc5ba1cc7f8402 (patch) | |
tree | 2ae0a56a636660946ac95e5c20a9daf1e3153268 | |
parent | b9f927ac2d6818cf51bf8cbbfdb1d238e6a525c8 (diff) | |
parent | 9d020bd57d6de7b4a51ed318f14a3cc6215f8e24 (diff) | |
download | AntennaPod-3bb8d9304a60207d05cf398f21cc5ba1cc7f8402.zip |
Merge pull request #1460 from mfietz/issue/1459-drawer-backbutton
Drawer: If open, back button closes it
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java | 9 | ||||
-rw-r--r-- | app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java | 12 |
2 files changed, 18 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java index 220724af4..39e86f94a 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -768,6 +768,15 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc } } + @Override + public void onBackPressed() { + if(isDrawerOpen()) { + drawerLayout.closeDrawer(navDrawer); + } else { + super.onBackPressed(); + } + } + private DBReader.NavDrawerData navDrawerData; diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index 211b895d0..2e626776b 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -8,8 +8,6 @@ import android.content.SharedPreferences; import android.content.res.Configuration; import android.database.DataSetObserver; import android.media.AudioManager; -import android.media.Rating; -import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -593,8 +591,16 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity } } + @Override + public void onBackPressed() { + if(isDrawerOpen()) { + drawerLayout.closeDrawer(navDrawer); + } else { + super.onBackPressed(); + } + } + private DBReader.NavDrawerData navDrawerData; - private AsyncTask<Void, Void, DBReader.NavDrawerData> loadTask; private int selectedNavListIndex = 0; private NavListAdapter.ItemAccess itemAccess = new NavListAdapter.ItemAccess() { |