From 61d5ba5a7c2f5beaeed4c0fb2ae9135ee77f272a Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 10 Nov 2014 11:59:54 +0000
Subject: [PATCH] Toolbar back navigation
---
.../net/i2p/android/help/BrowserConfigActivity.java | 13 +------------
.../java/net/i2p/android/help/HelpActivity.java | 13 +------------
2 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/app/src/main/java/net/i2p/android/help/BrowserConfigActivity.java b/app/src/main/java/net/i2p/android/help/BrowserConfigActivity.java
index 68b7450e3..addb0fd86 100644
--- a/app/src/main/java/net/i2p/android/help/BrowserConfigActivity.java
+++ b/app/src/main/java/net/i2p/android/help/BrowserConfigActivity.java
@@ -17,7 +17,6 @@ public class BrowserConfigActivity extends ActionBarActivity implements
* device.
*/
private boolean mTwoPane;
- private boolean mDetailShowing;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -27,6 +26,7 @@ public class BrowserConfigActivity extends ActionBarActivity implements
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (findViewById(R.id.detail_fragment) != null) {
// The detail container view will be present only in the
@@ -54,15 +54,6 @@ public class BrowserConfigActivity extends ActionBarActivity implements
}
}
- @Override
- public void onBackPressed() {
- if (mDetailShowing) {
- getSupportActionBar().setDisplayHomeAsUpEnabled(false);
- mDetailShowing = false;
- }
- super.onBackPressed();
- }
-
// BrowserAdapter.OnBrowserSelected
@Override
@@ -98,8 +89,6 @@ public class BrowserConfigActivity extends ActionBarActivity implements
.replace(R.id.main_fragment, configFrag)
.addToBackStack("config" + browser.packageName)
.commit();
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- mDetailShowing = true;
}
}
}
diff --git a/app/src/main/java/net/i2p/android/help/HelpActivity.java b/app/src/main/java/net/i2p/android/help/HelpActivity.java
index 0299e0cea..23fd74d0e 100644
--- a/app/src/main/java/net/i2p/android/help/HelpActivity.java
+++ b/app/src/main/java/net/i2p/android/help/HelpActivity.java
@@ -24,7 +24,6 @@ public class HelpActivity extends ActionBarActivity implements
* device.
*/
private boolean mTwoPane;
- private boolean mDetailShowing;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -34,6 +33,7 @@ public class HelpActivity extends ActionBarActivity implements
// Set the action bar
Toolbar toolbar = (Toolbar) findViewById(R.id.main_toolbar);
setSupportActionBar(toolbar);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
if (findViewById(R.id.detail_fragment) != null) {
// The detail container view will be present only in the
@@ -84,15 +84,6 @@ public class HelpActivity extends ActionBarActivity implements
}
}
- @Override
- public void onBackPressed() {
- if (mDetailShowing) {
- getSupportActionBar().setDisplayHomeAsUpEnabled(false);
- mDetailShowing = false;
- }
- super.onBackPressed();
- }
-
// HelpListFragment.OnEntrySelectedListener
@Override
@@ -129,8 +120,6 @@ public class HelpActivity extends ActionBarActivity implements
.replace(R.id.main_fragment, f)
.addToBackStack("help" + category)
.commit();
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- mDetailShowing = true;
}
}
}
--
GitLab