When opening app status from notification, ensure the settings are below
so back navigation works as expected
This commit is contained in:
parent
df788ba9a4
commit
2aa3a1b4be
1 changed files with 4 additions and 3 deletions
|
@ -28,10 +28,11 @@ class SettingsActivity : RequireProvisioningActivity(), OnPreferenceStartFragmen
|
||||||
|
|
||||||
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
|
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
|
||||||
|
|
||||||
|
// always start with settings fragment as a base (when fresh start)
|
||||||
|
if (savedInstanceState == null) showFragment(SettingsFragment())
|
||||||
|
// add app status fragment on the stack, if started via intent
|
||||||
if (intent?.action == ACTION_APP_STATUS_LIST) {
|
if (intent?.action == ACTION_APP_STATUS_LIST) {
|
||||||
showFragment(AppStatusFragment())
|
showFragment(AppStatusFragment(), true)
|
||||||
} else if (savedInstanceState == null) {
|
|
||||||
showFragment(SettingsFragment())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue