Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ConfigActivity: Show back arrow in single layout action bar

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland 2017-08-14 19:33:19 -05:00
parent 6604be94eb
commit d91770a1b6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/wireguard/android/ConfigActivity.java
View File

@ -35,6 +35,8 @@ public class ConfigActivity extends BaseConfigActivity {
isEditing = false; isEditing = false;
else else
setCurrentConfig(null); setCurrentConfig(null);
if (!isSplitLayout && fm.getBackStackEntryCount() == 0 && getActionBar() != null)
getActionBar().setDisplayHomeAsUpEnabled(false);
} }
@Override @Override
@ -80,6 +82,9 @@ public class ConfigActivity extends BaseConfigActivity {
@Override @Override
public boolean onOptionsItemSelected(final MenuItem item) { public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home:
onBackPressed();
return true;
case R.id.menu_action_edit: case R.id.menu_action_edit:
switchToFragment(mainContainer, TAG_EDIT, true); switchToFragment(mainContainer, TAG_EDIT, true);
isEditing = true; isEditing = true;
@ -168,6 +173,8 @@ public class ConfigActivity extends BaseConfigActivity {
if (push) { if (push) {
transaction.addToBackStack(null); transaction.addToBackStack(null);
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE); transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
if (!isSplitLayout && getActionBar() != null)
getActionBar().setDisplayHomeAsUpEnabled(true);
} }
transaction.replace(container, fragment, null).commit(); transaction.replace(container, fragment, null).commit();
} }